[packages/rpm] - pld specific macros must not override arch target ones

baggins baggins at pld-linux.org
Sun Jan 25 11:18:53 CET 2015


commit 8a13e4c4314ab94a5bd43fb8c6ea259537c21f9a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jan 25 09:32:01 2015 +0000

    - pld specific macros must not override arch target ones

 rpm.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 5dbfeec..5998f66 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1047,7 +1047,7 @@ sed -i \
 	--with-lua=%{!?with_system_lua:internal}%{?with_system_lua:external} \
 	--with-lzma=external \
 	--with-neon=%{?with_neon:external}%{!?with_neon:no} \
-	--with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \
+	--with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \
 	--without-path-versioned \
 	--with-pcre=%{!?with_system_pcre:internal}%{?with_system_pcre:external} \
 	--with-popt=external \
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list