SPECS: rpm.spec - first hack is unneeded

sparky sparky at pld-linux.org
Sun Feb 12 01:29:33 CET 2006


Author: sparky                       Date: Sun Feb 12 00:29:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- first hack is unneeded

---- Files affected:
SPECS:
   rpm.spec (1.728 -> 1.729) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.728 SPECS/rpm.spec:1.729
--- SPECS/rpm.spec:1.728	Sat Feb 11 22:30:37 2006
+++ SPECS/rpm.spec	Sun Feb 12 01:29:27 2006
@@ -30,7 +30,7 @@
 Name:		rpm
 %define	sover	4.4
 Version:	4.4.4
-Release:	0.4
+Release:	0.5
 License:	GPL
 Group:		Base
 Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -725,14 +725,8 @@
 
 # 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
-%ifarch %{ppc}
-TARG=$( echo %{_target_cpu} | sed 's/ppc//' )
-sed -e "s|@host@|ppc-%{_target_vendor}-linux-gnu|" \
-	-e "s|@host_cpu@|ppc|" macros.in > macros.tmp
-%else
 sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' \
 	-e 's|@host_cpu@|%{_target_cpu}|' macros.in > macros.tmp
-%endif
 mv -f macros.tmp macros.in
 
 CPPFLAGS="-Dglob=rpm_glob -Dglobfree=rpm_globfree"; export CPPFLAGS
@@ -1162,6 +1156,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.729  2006/02/12 00:29:27  sparky
+- first hack is unneeded
+
 Revision 1.728  2006/02/11 21:30:37  sparky
 - more --host=ppc7450-pld-linux-gnu must be killed
 
================================================================

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



More information about the pld-cvs-commit mailing list