From c8cbd244cf0b4d35bdb9e175863bff1e752cf67c Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Apr 08 2014 09:36:08 +0000
Subject: - Move the remaining dependency generator stuff to the kmp macro package

- Stop overriding rpm external dependency generator settings by default
- No normal package should ever end up using the old unmaintained
  dependency generator scripts from here, but the kmp system depends
  for now on the way this was previously set up here so letting
  that old cruft live in the non-default package for now.

---

diff --git a/macros b/macros
index b8d856f..5bc6e5c 100644
--- a/macros
+++ b/macros
@@ -175,9 +175,6 @@ package or when debugging this package.\
 # Use XZ compression for binary payloads
 %_binary_payload w2.xzdio
 
-%__find_provides        /usr/lib/rpm/redhat/find-provides
-%__find_requires        /usr/lib/rpm/redhat/find-requires
-
 %_hardening_cflags	-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1
 # we don't escape symbols '~', '"', etc. so be careful when changing this
 %_hardening_ldflags	-specs=/usr/lib/rpm/redhat/redhat-hardened-ld
diff --git a/macros.kmp b/macros.kmp
index 6b1e0e4..f91d593 100644
--- a/macros.kmp
+++ b/macros.kmp
@@ -2,6 +2,9 @@
 redhat_kernel_module_package	1
 kernel_module_package_release	1
 
+%__find_provides        /usr/lib/rpm/redhat/find-provides
+%__find_requires        /usr/lib/rpm/redhat/find-requires
+
 #kernel_module_package [ -n name ] [ -v version ] [ -r release ] [ -s script ]
 #                      [ -f filelist] [ -x ] [ -p preamble ] flavor flavor ...
 
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index f49631e..620a356 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -83,7 +83,7 @@ Red Hat specific rpm configuration files.
 
 %package -n kernel-rpm-macros
 Summary: Macros and scripts for building kernel module packages.
-Requires: redhat-rpm-config >= 12
+Requires: redhat-rpm-config >= 13
 
 %description -n kernel-rpm-macros
 Macros and scripts for building kernel module packages.
@@ -112,26 +112,26 @@ install -p -m 644 -t %{buildroot}%{_rpmconfigdir}/macros.d macros.*
 %files
 %defattr(-,root,root)
 %dir %{rrcdir}
-%dir %{rrcdir}/find-provides.d
 %{rrcdir}/macros
 %{rrcdir}/rpmrc
 %{rrcdir}/brp-*
 %{rrcdir}/dist.sh
-%{rrcdir}/find-provides
-%{rrcdir}/find-provides.libtool
-%{rrcdir}/find-provides.pkgconfig
-%{rrcdir}/find-requires
-%{rrcdir}/find-requires.libtool
-%{rrcdir}/find-requires.pkgconfig
 %{rrcdir}/redhat-hardened-*
 %{rrcdir}/config.*
 %{_rpmconfigdir}/macros.d/macros.*-srpm
 %{_rpmconfigdir}/macros.d/macros.dwz
 
 %files -n kernel-rpm-macros
+%dir %{rrcdir}/find-provides.d
 %{rrcdir}/kmodtool
 %{rrcdir}/rpmsort
 %{rrcdir}/symset-table
+%{rrcdir}/find-provides
+%{rrcdir}/find-provides.libtool
+%{rrcdir}/find-provides.pkgconfig
+%{rrcdir}/find-requires
+%{rrcdir}/find-requires.libtool
+%{rrcdir}/find-requires.pkgconfig
 %{rrcdir}/find-provides.ksyms
 %{rrcdir}/find-requires.ksyms
 %{rrcdir}/find-provides.d/firmware.prov
@@ -139,6 +139,10 @@ install -p -m 644 -t %{buildroot}%{_rpmconfigdir}/macros.d macros.*
 %{_rpmconfigdir}/macros.d/macros.kmp
 
 %changelog
+* Tue Apr 08 2014  Panu Matilainen <pmatilai@redhat.com> - 13-1
+- Move the remaining dependency generator stuff to the kmp macro package
+- Stop overriding rpm external dependency generator settings by default
+
 * Mon Apr 07 2014  Panu Matilainen <pmatilai@redhat.com> - 12-1
 - Be more explicit about the package contents
 - Split kernel module macros to a separate file