[packages/rpm] - sync macros and host definitions with our rpm4

[baggins]

commit 048d06f838305ee8841eca3b553785d9fd8b399d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Sep 7 12:22:54 2012 +0200

    - sync macros and host definitions with our rpm4

 macros.pld.in | 29 +++++++++++++++++++++++++----
 rpm.spec      |  9 ++++++++-
 2 files changed, 33 insertions(+), 5 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 3561eea..15d4d2e 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -55,7 +55,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.10
-Release:	0.1
+Release:	0.2
 License:	LGPL
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -860,6 +860,13 @@ awk -f %{SOURCE6} %{SOURCE1}
 %{__autoconf}
 %{__automake}
 
+# rpm checks for CPU type at runtime, but it looks better
+sed -i \
+	-e 's|@host@|%{_target_cpu}-%{_target_vendor}-%{_target_os}|' \
+	-e 's|@host_cpu@|%{_target_cpu}|' \
+	-e 's|@host_os@|%{_target_os}|' \
+	macros.in
+
 %{?with_system_lua:CPPFLAGS="-I/usr/include/lua51 %{rpmcppflags}"}
 # pass CC and CXX too in case of building with some older configure macro
 %configure \
diff --git a/macros.pld.in b/macros.pld.in
index 8cc429c..3cb7635 100644
--- a/macros.pld.in
+++ b/macros.pld.in
@@ -95,6 +95,11 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 #---------------------------------------------------------------------
 # Overwrite RPM macros with PLD specific one here.
 
+%__grep			/bin/grep
+%__lua			%{_bindir}/lua
+%__rc			%{_bindir}/rc
+%__xar			%{_bindir}/xar
+
 %_tmppath		%(echo "${TMPDIR:-/var/tmp}")
 %tmpdir			%{_tmppath}
 
@@ -127,10 +132,26 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 
 # Warning: those macros are overwritten by macros.build,
 #          left here for compatibility
-%rpmcflags	%{nil}
-%rpmcxxflags	%{nil}
-%rpmldflags	%{nil}
-%rpmcppflags	%{nil}
+%rpmcflags %(awk 'BEGIN {
+       split("%{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}",I);
+       split("%{?filterout} %{?filterout_c} %{?filterout_ld}",F);
+       %{filter_out}
+}')
+%rpmcppflags       %(awk 'BEGIN {
+       split("%{?debug:%debugcppflags}%{!?debug:%optcppflags}%{?debuginfocppflags}",I);
+       split("%{?filterout} %{?filterout_cpp} %{?filterout_cpp}",F);
+       %{filter_out}
+}')
+%rpmcxxflags       %(awk 'BEGIN {
+       split("%{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}",I);
+       split("%{?filterout} %{?filterout_cxx} %{?filterout_ld}",F);
+       %{filter_out}
+}')
+%rpmldflags        %(awk 'BEGIN {
+       split("%{?optldflags}",I);
+       split("%{?filterout_ld}",F)
+       %{filter_out}
+}')
 
 # common compilation flags
 %_fortify_cflags	-Wp,-D_FORTIFY_SOURCE=2
================================================================

---- gitweb:

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