1 --- rpm-5.4.15/macros/macros.in~ 2020-01-22 14:38:03.000000000 +0100
2 +++ rpm-5.4.15/macros/macros.in 2020-01-22 14:39:17.309422644 +0100
3 @@ -1024,64 +1024,11 @@
4 # XXX if the file %{_usrlibrpm}/macros.d/cmake attempts another
5 # XXX %{load:...}, then the statement will be IGNORED.
6 #==============================================================================
7 -# ---- SELinux configuration macros.
8 -#%%{load:%{_usrlibrpm}/macros.d/selinux}
10 -#==============================================================================
11 # ---- rpmbuild macros.
12 -#%%{load:%{_usrlibrpm}/macros.rpmbuild}
14 -#------------------------------------------------------------------------
15 -# cmake(...) configuration
16 -#%%{load:%{_usrlibrpm}/macros.d/cmake}
18 -#------------------------------------------------------------------------
19 -# gstreamer(...) configuration.
20 -#%%{load:%{_usrlibrpm}/macros.d/gstreamer}
22 -#------------------------------------------------------------------------
23 -# haskell(...) configuration.
24 -#%%{load:%{_usrlibrpm}/macros.d/haskell}
26 -#------------------------------------------------------------------------
27 -# perl(...) configuration
28 -#%%{load:%{_usrlibrpm}/macros.d/perl}
30 -#------------------------------------------------------------------------
31 -# python(...) configuration.
32 -#%%{load:%{_usrlibrpm}/macros.d/python}
34 -#------------------------------------------------------------------------
35 -# php(...) configuration.
36 -#%%{load:%{_usrlibrpm}/macros.d/php}
38 -#------------------------------------------------------------------------
39 -# java(...) configuration.
40 -#%%{load:%{_usrlibrpm}/macros.d/java}
42 -#------------------------------------------------------------------------
43 -# libtool(...) configuration.
44 -#%%{load:%{_usrlibrpm}/macros.d/libtool}
46 -#------------------------------------------------------------------------
47 -# pkgconfig(...) configuration.
48 -#%%{load:%{_usrlibrpm}/macros.d/pkgconfig}
50 -#------------------------------------------------------------------------
51 -# mono(...) configuration.
52 -#%%{load:%{_usrlibrpm}/macros.d/mono}
54 -#------------------------------------------------------------------------
55 -# ruby(...) configuration.
56 -#%%{load:%{_usrlibrpm}/macros.d/ruby}
58 -#------------------------------------------------------------------------
59 -# tcl(...) configuration.
60 -#%%{load:%{_usrlibrpm}/macros.d/tcl}
61 +%{load:%{_usrlibrpm}/macros.rpmbuild}
63 #------------------------------------------------------------------------
64 -# typelib(...) configuration.
65 -#%%{load:%{_usrlibrpm}/macros.d/typelib}
66 +%{load:%{_usrlibrpm}/macros.d/macros.*}