SPECS: rpm.spec - -provides-dont-obsolete.patch obsolete; leave ts...

[arekm]

Author: arekm                        Date: Tue Oct  2 13:50:56 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- -provides-dont-obsolete.patch obsolete; leave tsc disabling patch in ifarch

---- Files affected:
SPECS:
   rpm.spec (1.844 -> 1.845) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.844 SPECS/rpm.spec:1.845
--- SPECS/rpm.spec:1.844	Tue Oct  2 15:44:21 2007
+++ SPECS/rpm.spec	Tue Oct  2 15:50:51 2007
@@ -86,7 +86,6 @@
 
 Patch18:	%{name}-perl_req.patch
 
-Patch22:	%{name}-provides-dont-obsolete.patch
 Patch23:	%{name}-pkgconfigdeps.patch
 
 Patch25:	%{name}-rpm2cpio-payload.patch
@@ -630,12 +629,12 @@
 install %{SOURCE9} scripts/php.prov.in
 install %{SOURCE10} scripts/php.req.in
 install %{SOURCE12} scripts/perl.prov
-# CHECK ME. REPLACE WITH MACRO %_upgrade_tag name
-#%patch22 -p1
 %patch23 -p1
 %patch25 -p1
-# CHECK ME, possibly drop since we don't support i386 anymore
-# %patch26 -p1
+%ifarch i386
+# disable TSC
+%patch26 -p1
+%endif
 %patch27 -p1
 # CHECK ME
 #%patch31 -p1
@@ -1166,6 +1165,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.845  2007/10/02 13:50:51  arekm
+- -provides-dont-obsolete.patch obsolete; leave tsc disabling patch in ifarch
+
 Revision 1.844  2007/10/02 13:44:21  arekm
 - macros, javadeps fixed
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.844&r2=1.845&f=u