SPECS: rpm.spec - rel 11; should fix _host, _build, _target issues

[arekm]

Author: arekm                        Date: Thu Feb  8 13:47:58 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 11; should fix _host, _build, _target issues

---- Files affected:
SPECS:
   rpm.spec (1.789 -> 1.790) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.789 SPECS/rpm.spec:1.790
--- SPECS/rpm.spec:1.789	Thu Feb  8 09:43:05 2007
+++ SPECS/rpm.spec	Thu Feb  8 14:47:53 2007
@@ -35,7 +35,7 @@
 Summary(uk):	íĹÎĹÄÖĹŇ ĐÁËĹÔŚ× ×ŚÄ RPM
 Name:		rpm
 Version:	4.4.7
-Release:	10.1
+Release:	11
 License:	GPL
 Group:		Base
 Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -99,7 +99,7 @@
 Patch37:	%{name}-doxygen_hack.patch
 Patch38:	%{name}-empty-rpmlock-path.patch
 Patch39:	%{name}-pythondeps.patch
-
+Patch40:	%{name}-vendor.patch
 Patch41:	%{name}-reduce-stack-usage.patch
 Patch42:	%{name}-old-fileconflicts-behaviour.patch
 Patch43:	%{name}-patch-quote.patch
@@ -685,6 +685,7 @@
 %patch37 -p1
 %patch38 -p1
 %patch39 -p1
+%patch40 -p0
 %patch41 -p1
 %patch42 -p1
 %patch43 -p1
@@ -749,9 +750,7 @@
 
 # config.guess doesn't handle athlon, so we have to change it by hand.
 # rpm checks for CPU type at runtime, but it looks better
-sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' \
-	-e 's|@host_cpu@|%{_target_cpu}|' macros.in > macros.tmp
-mv -f macros.tmp macros.in
+sed -i -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' -e 's|@host_cpu@|%{_target_cpu}|' macros.in
 
 CPPFLAGS="-Dglob=rpm_glob -Dglobfree=rpm_globfree"; export CPPFLAGS
 
@@ -1181,6 +1180,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.790  2007/02/08 13:47:53  arekm
+- rel 11; should fix _host, _build, _target issues
+
 Revision 1.789  2007/02/08 08:43:05  arekm
 - system provides like some /proc files needed by dev.spec
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.789&r2=1.790&f=u