[packages/rpm/dev-5.4.17: 2/3] - make sure all macros are loaded

[qboosh]

commit 561ddc70938de35a39826db739800049454d33a3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Feb 5 20:41:33 2020 +0100

    - make sure all macros are loaded

 rpm-5.4.7-kmod-dependencies.patch          |  13 ----
 rpm-5.4.9-keep-loading-script-macros.patch | 104 ++++++++++++++---------------
 2 files changed, 51 insertions(+), 66 deletions(-)
---
diff --git a/rpm-5.4.7-kmod-dependencies.patch b/rpm-5.4.7-kmod-dependencies.patch
index df3d02c..daa0dc2 100644
--- a/rpm-5.4.7-kmod-dependencies.patch
+++ b/rpm-5.4.7-kmod-dependencies.patch
@@ -51,16 +51,3 @@
  # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
  %__kernel_provides	%{_rpmhome}/kmod-deps.sh --provides --modinfo %__modinfo
  #%__kernel_requires	%{_rpmhome}/kmod-deps.sh --requires --modinfo %__modinfo
---- rpm-5.4.7/macros/macros.in.kmod~	2012-03-16 16:34:04.614654786 +0100
-+++ rpm-5.4.7/macros/macros.in	2012-03-16 16:34:04.645654836 +0100
-@@ -981,6 +981,10 @@ $_arbitrary_tags_tests	Foo:Bar
- %{load:%{_usrlibrpm}/macros.d/haskell}
- 
- #------------------------------------------------------------------------
-+# kmod(...) configuration.
-+%{load:%{_usrlibrpm}/macros.d/kernel}
-+
-+#------------------------------------------------------------------------
- # perl(...) configuration
- %{load:%{_usrlibrpm}/macros.d/perl}
- 
diff --git a/rpm-5.4.9-keep-loading-script-macros.patch b/rpm-5.4.9-keep-loading-script-macros.patch
index 48244d0..7a05087 100644
--- a/rpm-5.4.9-keep-loading-script-macros.patch
+++ b/rpm-5.4.9-keep-loading-script-macros.patch
@@ -1,70 +1,68 @@
---- rpm-5.4.16/macros/macros.in~	2016-04-20 16:52:06.000000000 +0300
-+++ rpm-5.4.16/macros/macros.in	2016-04-20 16:52:40.148730512 +0300
-@@ -1054,11 +1054,11 @@
+--- rpm-5.4.17/macros/macros.in.orig	2020-02-05 17:52:34.415469263 +0100
++++ rpm-5.4.17/macros/macros.in	2020-02-05 18:03:36.605215206 +0100
+@@ -1035,64 +1035,11 @@
+ # XXX	if the file %{_usrlibrpm}/macros.d/cmake attempts another
+ # XXX	%{load:...}, then loading will CEASE at that point in the file.
+ #==============================================================================
+-# ---- SELinux configuration macros.
+-%{load:%{_usrlibrpm}/macros.d/selinux}
+-
+-#==============================================================================
+ # ---- rpmbuild macros.
+ %{load:%{_usrlibrpm}/macros.rpmbuild}
  
  #------------------------------------------------------------------------
- # cmake(...) configuration
+-# cmake(...) configuration
 -#%%{load:%{_usrlibrpm}/macros.d/cmake}
-+%{load:%{_usrlibrpm}/macros.d/cmake}
- 
- #------------------------------------------------------------------------
- # gstreamer(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# gstreamer(...) configuration.
 -#%%{load:%{_usrlibrpm}/macros.d/gstreamer}
-+%{load:%{_usrlibrpm}/macros.d/gstreamer}
- 
- #------------------------------------------------------------------------
- # haskell(...) configuration.
-@@ -1066,43 +1066,43 @@
- 
- #------------------------------------------------------------------------
- # perl(...) configuration
+-
+-#------------------------------------------------------------------------
+-# haskell(...) configuration.
+-#%%{load:%{_usrlibrpm}/macros.d/haskell}
+-
+-#------------------------------------------------------------------------
+-# perl(...) configuration
 -#%%{load:%{_usrlibrpm}/macros.d/perl}
-+%{load:%{_usrlibrpm}/macros.d/perl}
- 
- #------------------------------------------------------------------------
- # python(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# python(...) configuration.
 -#%%{load:%{_usrlibrpm}/macros.d/python}
-+%{load:%{_usrlibrpm}/macros.d/python}
- 
- #------------------------------------------------------------------------
- # php(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# php(...) configuration.
 -#%%{load:%{_usrlibrpm}/macros.d/php}
-+%{load:%{_usrlibrpm}/macros.d/php}
- 
- #------------------------------------------------------------------------
- # java(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# java(...) configuration.
 -#%%{load:%{_usrlibrpm}/macros.d/java}
-+%{load:%{_usrlibrpm}/macros.d/java}
- 
- #------------------------------------------------------------------------
- # libtool(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# libtool(...) configuration.
 -#%%{load:%{_usrlibrpm}/macros.d/libtool}
-+%{load:%{_usrlibrpm}/macros.d/libtool}
- 
- #------------------------------------------------------------------------
- # pkgconfig(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# pkgconfig(...) configuration.
 -#%%{load:%{_usrlibrpm}/macros.d/pkgconfig}
-+%{load:%{_usrlibrpm}/macros.d/pkgconfig}
- 
- #------------------------------------------------------------------------
- # mono(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# mono(...) configuration.
 -#%%{load:%{_usrlibrpm}/macros.d/mono}
-+%{load:%{_usrlibrpm}/macros.d/mono}
- 
- #------------------------------------------------------------------------
- # ruby(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# ruby(...) configuration.
 -#%%{load:%{_usrlibrpm}/macros.d/ruby}
-+%{load:%{_usrlibrpm}/macros.d/ruby}
- 
- #------------------------------------------------------------------------
- # tcl(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# tcl(...) configuration.
 -#%%{load:%{_usrlibrpm}/macros.d/tcl}
-+%{load:%{_usrlibrpm}/macros.d/tcl}
- 
- #------------------------------------------------------------------------
- # typelib(...) configuration.
+-
+-#------------------------------------------------------------------------
+-# typelib(...) configuration.
 -#%%{load:%{_usrlibrpm}/macros.d/typelib}
-+%{load:%{_usrlibrpm}/macros.d/typelib}
++%{load:%{_usrlibrpm}/macros.d/macros.*}
  
  # \endverbatim
  #*/
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/eb96eefe523b1babed59864568efd8980db84586