[packages/rpm] No need to everwrite default macro paths, just add ours

baggins baggins at pld-linux.org
Tue Sep 4 12:41:41 CEST 2012


commit 0387ab85731371ea5d0524adb9afc3ac3a22a241
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Sep 4 12:41:03 2012 +0200

    No need to everwrite default macro paths, just add ours

 rpm.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 8fecaf7..f131ab6 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -765,8 +765,7 @@ awk -f %{SOURCE6} %{SOURCE1}
 	--with-pcre=external \
 	--with-keyutils=none \
 	--without-path-versioned \
-	--with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/%%{_target}/macros:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \
-	--with-extra-path-macros=%{_rpmlibdir}/platform/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:%{_rpmlibdir}/macros.d/pld \
+	--with-extra-path-macros='%{_sysconfdir}/rpm/macros.d/*.macros:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/macros.d/pld:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \
 	--with-bugreport="http://bugs.pld-linux.org/" \
 	--with-vendor=pld
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/0387ab85731371ea5d0524adb9afc3ac3a22a241



More information about the pld-cvs-commit mailing list