- make sure all macros are loaded

[packages/rpm.git] / rpm-5.4.9-keep-loading-script-macros.patch

diff --git a/rpm-5.4.9-keep-loading-script-macros.patch b/rpm-5.4.9-keep-loading-script-macros.patch
index a9d23f92a7182a1b8716370504cbca29f83b5155..8237f40afff9081bbc99421d005348ccc6b50710 100644 (file)
--- a/rpm-5.4.9-keep-loading-script-macros.patch
+++ b/rpm-5.4.9-keep-loading-script-macros.patch
@@ -1,80 +1,69 @@
---- rpm-5.4.9/macros/macros.in.script_macros~  2012-05-07 00:36:51.000000000 +0200
-+++ rpm-5.4.9/macros/macros.in 2012-05-15 01:39:37.382649841 +0200
-@@ -993,63 +993,63 @@ $_arbitrary_tags_tests   Foo:Bar
- # XXX %{load:...}, then loading will CEASE at that point in the file.
+--- rpm-5.4.15/macros/macros.in~       2020-01-22 14:38:03.000000000 +0100
++++ rpm-5.4.15/macros/macros.in        2020-01-22 14:39:17.309422644 +0100
+@@ -1024,64 +1024,11 @@
+ # XXX if the file %{_usrlibrpm}/macros.d/cmake attempts another
+ # XXX %{load:...}, then the statement will be IGNORED.
  #==============================================================================
- # ---- SELinux configuration macros.
+-# ---- SELinux configuration macros.
 -#%%{load:%{_usrlibrpm}/macros.d/selinux}
-+%{load:%{_usrlibrpm}/macros.d/selinux}
- 
- #==============================================================================
+-
+-#==============================================================================
  # ---- rpmbuild macros.
 -#%%{load:%{_usrlibrpm}/macros.rpmbuild}
-+%{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.
- #%%{load:%{_usrlibrpm}/macros.d/haskell}
- 
- #------------------------------------------------------------------------
- # 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}
++%{load:%{_usrlibrpm}/macros.rpmbuild}
  
  #------------------------------------------------------------------------
- # typelib(...) configuration.
+-# typelib(...) configuration.
 -#%%{load:%{_usrlibrpm}/macros.d/typelib}
-+#%%{load:%{_usrlibrpm}/macros.d/typelib}
++%{load:%{_usrlibrpm}/macros.d/macros.*}
  
  # \endverbatim
  #*/