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

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