]>
Commit | Line | Data |
---|---|---|
70f8787d JR |
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} | |
9 | ||
10 | #============================================================================== | |
11 | # ---- rpmbuild macros. | |
12 | -#%%{load:%{_usrlibrpm}/macros.rpmbuild} | |
13 | +%{load:%{_usrlibrpm}/macros.rpmbuild} | |
14 | ||
15 | #------------------------------------------------------------------------ | |
16 | # cmake(...) configuration | |
17 | -#%%{load:%{_usrlibrpm}/macros.d/cmake} | |
18 | +%{load:%{_usrlibrpm}/macros.d/cmake} | |
19 | ||
20 | #------------------------------------------------------------------------ | |
21 | # gstreamer(...) configuration. | |
22 | -#%%{load:%{_usrlibrpm}/macros.d/gstreamer} | |
23 | +%{load:%{_usrlibrpm}/macros.d/gstreamer} | |
24 | ||
25 | #------------------------------------------------------------------------ | |
26 | # haskell(...) configuration. | |
27 | #%%{load:%{_usrlibrpm}/macros.d/haskell} | |
28 | ||
29 | #------------------------------------------------------------------------ | |
30 | # perl(...) configuration | |
31 | -#%%{load:%{_usrlibrpm}/macros.d/perl} | |
32 | +%{load:%{_usrlibrpm}/macros.d/perl} | |
33 | ||
34 | #------------------------------------------------------------------------ | |
35 | # python(...) configuration. | |
36 | -#%%{load:%{_usrlibrpm}/macros.d/python} | |
37 | +%{load:%{_usrlibrpm}/macros.d/python} | |
38 | ||
39 | #------------------------------------------------------------------------ | |
40 | # php(...) configuration. | |
41 | -#%%{load:%{_usrlibrpm}/macros.d/php} | |
42 | +%{load:%{_usrlibrpm}/macros.d/php} | |
43 | ||
44 | #------------------------------------------------------------------------ | |
45 | # java(...) configuration. | |
46 | -#%%{load:%{_usrlibrpm}/macros.d/java} | |
47 | +%{load:%{_usrlibrpm}/macros.d/java} | |
48 | ||
49 | #------------------------------------------------------------------------ | |
50 | # libtool(...) configuration. | |
51 | -#%%{load:%{_usrlibrpm}/macros.d/libtool} | |
52 | +%{load:%{_usrlibrpm}/macros.d/libtool} | |
53 | ||
54 | #------------------------------------------------------------------------ | |
55 | # pkgconfig(...) configuration. | |
56 | -#%%{load:%{_usrlibrpm}/macros.d/pkgconfig} | |
57 | +%{load:%{_usrlibrpm}/macros.d/pkgconfig} | |
58 | ||
59 | #------------------------------------------------------------------------ | |
60 | # mono(...) configuration. | |
61 | -#%%{load:%{_usrlibrpm}/macros.d/mono} | |
62 | +%{load:%{_usrlibrpm}/macros.d/mono} | |
63 | ||
64 | #------------------------------------------------------------------------ | |
65 | # ruby(...) configuration. | |
66 | -#%%{load:%{_usrlibrpm}/macros.d/ruby} | |
67 | +%{load:%{_usrlibrpm}/macros.d/ruby} | |
68 | ||
69 | #------------------------------------------------------------------------ | |
70 | # tcl(...) configuration. | |
71 | -#%%{load:%{_usrlibrpm}/macros.d/tcl} | |
72 | +%{load:%{_usrlibrpm}/macros.d/tcl} | |
73 | ||
74 | #------------------------------------------------------------------------ | |
75 | # typelib(...) configuration. | |
76 | -#%%{load:%{_usrlibrpm}/macros.d/typelib} | |
d2b7930e | 77 | +#%%{load:%{_usrlibrpm}/macros.d/typelib} |
70f8787d JR |
78 | |
79 | # \endverbatim | |
80 | #*/ |