mirror of
https://abf.rosa.ru/djam/rpm.git
synced 2025-02-23 18:33:04 +00:00
81 lines
3.1 KiB
Diff
81 lines
3.1 KiB
Diff
--- 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.
|
|
#==============================================================================
|
|
# ---- 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
|
|
-#%%{load:%{_usrlibrpm}/macros.d/cmake}
|
|
+%{load:%{_usrlibrpm}/macros.d/cmake}
|
|
|
|
#------------------------------------------------------------------------
|
|
# gstreamer(...) configuration.
|
|
-#%%{load:%{_usrlibrpm}/macros.d/gstreamer}
|
|
+%{load:%{_usrlibrpm}/macros.d/gstreamer}
|
|
|
|
#------------------------------------------------------------------------
|
|
# haskell(...) configuration.
|
|
-#%%{load:%{_usrlibrpm}/macros.d/haskell}
|
|
+# % {load:%{_usrlibrpm}/macros.d/haskell} # provided by haskell-macros for now
|
|
|
|
#------------------------------------------------------------------------
|
|
# perl(...) configuration
|
|
-#%%{load:%{_usrlibrpm}/macros.d/perl}
|
|
+%{load:%{_usrlibrpm}/macros.d/perl}
|
|
|
|
#------------------------------------------------------------------------
|
|
# python(...) configuration.
|
|
-#%%{load:%{_usrlibrpm}/macros.d/python}
|
|
+%{load:%{_usrlibrpm}/macros.d/python}
|
|
|
|
#------------------------------------------------------------------------
|
|
# php(...) configuration.
|
|
-#%%{load:%{_usrlibrpm}/macros.d/php}
|
|
+%{load:%{_usrlibrpm}/macros.d/php}
|
|
|
|
#------------------------------------------------------------------------
|
|
# java(...) configuration.
|
|
-#%%{load:%{_usrlibrpm}/macros.d/java}
|
|
+%{load:%{_usrlibrpm}/macros.d/java}
|
|
|
|
#------------------------------------------------------------------------
|
|
# libtool(...) configuration.
|
|
-#%%{load:%{_usrlibrpm}/macros.d/libtool}
|
|
+%{load:%{_usrlibrpm}/macros.d/libtool}
|
|
|
|
#------------------------------------------------------------------------
|
|
# pkgconfig(...) configuration.
|
|
-#%%{load:%{_usrlibrpm}/macros.d/pkgconfig}
|
|
+%{load:%{_usrlibrpm}/macros.d/pkgconfig}
|
|
|
|
#------------------------------------------------------------------------
|
|
# mono(...) configuration.
|
|
-#%%{load:%{_usrlibrpm}/macros.d/mono}
|
|
+%{load:%{_usrlibrpm}/macros.d/mono}
|
|
|
|
#------------------------------------------------------------------------
|
|
# ruby(...) configuration.
|
|
-#%%{load:%{_usrlibrpm}/macros.d/ruby}
|
|
+%{load:%{_usrlibrpm}/macros.d/ruby}
|
|
|
|
#------------------------------------------------------------------------
|
|
# tcl(...) configuration.
|
|
-#%%{load:%{_usrlibrpm}/macros.d/tcl}
|
|
+%{load:%{_usrlibrpm}/macros.d/tcl}
|
|
|
|
#------------------------------------------------------------------------
|
|
# typelib(...) configuration.
|
|
-#%%{load:%{_usrlibrpm}/macros.d/typelib}
|
|
+%{load:%{_usrlibrpm}/macros.d/typelib}
|
|
|
|
# \endverbatim
|
|
#*/
|