- modified to support rpm-tld-macros which replaced rpm-build-macros

[packages/rpm.git] / rpm-macros.patch

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 567b85261ac844f1d10932bdf509ebd0da9e443b..f41a0826a68056c6479548388abe90684084b204 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -152,7 +152,7 @@
 -%__scriptlet_requires /bin/bash --rpm-requires
 +#%__scriptlet_requires        /bin/bash --rpm-requires
 +
-+# PLD rpm macros
++# TLD rpm macros
 +%_enable_debug_packages 1
 +
 +#-----------------------------------------------------------------
@@ -218,7 +218,7 @@
  AC_SUBST(SYSCONFIGDIR)
  
 -MACROFILES="${USRLIBRPM}/${VERSION}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/%{_host_vendor}/macros:${SYSCONFIGDIR}/%{_host_vendor}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros.d/*.macros:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros"
-+MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/macros.build:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros"
++MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/macros.build:${USRLIBRPM}/macros.d/macros.*:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros"
  AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES",
        [Colon separated paths of macro files to read.])
  AC_SUBST(MACROFILES)