1 --- rpm-5.4.9/macros/macros.in.script_macros~ 2012-05-07 00:36:51.000000000 +0200
2 +++ rpm-5.4.9/macros/macros.in 2012-05-15 01:39:37.382649841 +0200
3 @@ -993,63 +993,63 @@ $_arbitrary_tags_tests Foo:Bar
4 # XXX %{load:...}, then loading will CEASE at that point in the file.
5 #==============================================================================
6 # ---- SELinux configuration macros.
7 -#%%{load:%{_usrlibrpm}/macros.d/selinux}
8 +%{load:%{_usrlibrpm}/macros.d/selinux}
10 #==============================================================================
11 # ---- rpmbuild macros.
12 -#%%{load:%{_usrlibrpm}/macros.rpmbuild}
13 +%{load:%{_usrlibrpm}/macros.rpmbuild}
15 #------------------------------------------------------------------------
16 # cmake(...) configuration
17 -#%%{load:%{_usrlibrpm}/macros.d/cmake}
18 +%{load:%{_usrlibrpm}/macros.d/cmake}
20 #------------------------------------------------------------------------
21 # gstreamer(...) configuration.
22 -#%%{load:%{_usrlibrpm}/macros.d/gstreamer}
23 +%{load:%{_usrlibrpm}/macros.d/gstreamer}
25 #------------------------------------------------------------------------
26 # haskell(...) configuration.
27 #%%{load:%{_usrlibrpm}/macros.d/haskell}
29 #------------------------------------------------------------------------
30 # perl(...) configuration
31 -#%%{load:%{_usrlibrpm}/macros.d/perl}
32 +%{load:%{_usrlibrpm}/macros.d/perl}
34 #------------------------------------------------------------------------
35 # python(...) configuration.
36 -#%%{load:%{_usrlibrpm}/macros.d/python}
37 +%{load:%{_usrlibrpm}/macros.d/python}
39 #------------------------------------------------------------------------
40 # php(...) configuration.
41 -#%%{load:%{_usrlibrpm}/macros.d/php}
42 +%{load:%{_usrlibrpm}/macros.d/php}
44 #------------------------------------------------------------------------
45 # java(...) configuration.
46 -#%%{load:%{_usrlibrpm}/macros.d/java}
47 +%{load:%{_usrlibrpm}/macros.d/java}
49 #------------------------------------------------------------------------
50 # libtool(...) configuration.
51 -#%%{load:%{_usrlibrpm}/macros.d/libtool}
52 +%{load:%{_usrlibrpm}/macros.d/libtool}
54 #------------------------------------------------------------------------
55 # pkgconfig(...) configuration.
56 -#%%{load:%{_usrlibrpm}/macros.d/pkgconfig}
57 +%{load:%{_usrlibrpm}/macros.d/pkgconfig}
59 #------------------------------------------------------------------------
60 # mono(...) configuration.
61 -#%%{load:%{_usrlibrpm}/macros.d/mono}
62 +%{load:%{_usrlibrpm}/macros.d/mono}
64 #------------------------------------------------------------------------
65 # ruby(...) configuration.
66 -#%%{load:%{_usrlibrpm}/macros.d/ruby}
67 +%{load:%{_usrlibrpm}/macros.d/ruby}
69 #------------------------------------------------------------------------
70 # tcl(...) configuration.
71 -#%%{load:%{_usrlibrpm}/macros.d/tcl}
72 +%{load:%{_usrlibrpm}/macros.d/tcl}
74 #------------------------------------------------------------------------
75 # typelib(...) configuration.
76 -#%%{load:%{_usrlibrpm}/macros.d/typelib}
77 +%{load:%{_usrlibrpm}/macros.d/typelib}