[packages/rpm] - condition to enable TSC has been reverted just for us, so update patch accordingly

[baggins]

commit 686b02042d88dc02c068c5f672236801a2b1519f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Sep 6 07:46:06 2012 +0200

    - condition to enable TSC has been reverted just for us, so update patch
      accordingly

 rpm-notsc.patch | 4 ++--
 rpm.spec        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 9e7145b..3561eea 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -767,8 +767,8 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 # CHECK ME - macrofiles: ~/etc could be used
 #%%patch14 -p1
 %patch16 -p1
-%ifarch i386 i486
-# disable TSC
+%ifnarch i386 i486
+# enable TSC for capable archs
 %patch26 -p1
 %endif
 %patch27 -p1
diff --git a/rpm-notsc.patch b/rpm-notsc.patch
index 17eb68a..b42c40e 100644
--- a/rpm-notsc.patch
+++ b/rpm-notsc.patch
@@ -4,8 +4,8 @@
  /*@unchecked@*/
  static int rpmsw_initialized = 0;
  
--#if defined(__i386__)
-+#if 0 && defined(__i386__)
+-#if defined(__linux__) && defined(__i386__) && !defined(RPM_VENDOR_PLD)
++#if defined(__linux__) && defined(__i386__)
  /* Swiped from glibc-2.3.2 sysdeps/i386/i686/hp-timing.h */
  
  #define	HP_TIMING_ZERO(Var)	(Var) = (0)
================================================================

---- gitweb:

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