[rpm/f17] - Updated rpm-4.6.0-niagara.patch after addition of the ppc64p7 support

Phil Knirsch pknirsch at fedoraproject.org
Thu Apr 19 15:09:25 UTC 2012


commit b88a8e4d8a94eac72c66998872c2704fe062e008
Author: Phil Knirsch <pknirsch at redhat.com>
Date:   Thu Apr 19 17:08:46 2012 +0200

    - Updated rpm-4.6.0-niagara.patch after addition of the ppc64p7 support

 rpm-4.6.0-niagara.patch |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/rpm-4.6.0-niagara.patch b/rpm-4.6.0-niagara.patch
index 22cb3a5..c465b65 100644
--- a/rpm-4.6.0-niagara.patch
+++ b/rpm-4.6.0-niagara.patch
@@ -1,7 +1,7 @@
-diff -rNu rpm-4.6.0-orig/lib/rpmrc.c rpm-4.6.0/lib/rpmrc.c
---- rpm-4.6.0-orig/lib/rpmrc.c	2009-03-09 21:54:49.000000000 -0500
-+++ rpm-4.6.0/lib/rpmrc.c	2009-03-11 12:00:44.000000000 -0500
-@@ -763,6 +763,31 @@
+diff -up rpm-4.9.1.3/lib/rpmrc.c.niagara rpm-4.9.1.3/lib/rpmrc.c
+--- rpm-4.9.1.3/lib/rpmrc.c.niagara	2012-04-19 17:06:23.130595223 +0200
++++ rpm-4.9.1.3/lib/rpmrc.c	2012-04-19 17:06:23.134739249 +0200
+@@ -718,6 +718,31 @@ exit:
      return rc;
  }
  
@@ -33,7 +33,7 @@ diff -rNu rpm-4.6.0-orig/lib/rpmrc.c rpm-4.6.0/lib/rpmrc.c
  
  #	if defined(__linux__) && defined(__i386__)
  #include <setjmp.h>
-@@ -1179,6 +1204,13 @@
+@@ -1178,6 +1203,13 @@ static void defaultMachine(const char **
  		personality(oldpers);
  	    }
  	}
@@ -46,11 +46,11 @@ diff -rNu rpm-4.6.0-orig/lib/rpmrc.c rpm-4.6.0/lib/rpmrc.c
 +	}
  #	endif	/* sparc*-linux */
  
- #	if defined(__GNUC__) && defined(__alpha__)
-diff -rNu rpm-4.6.0-orig/rpmrc.in rpm-4.6.0/rpmrc.in
---- rpm-4.6.0-orig/rpmrc.in	2009-03-09 21:54:49.000000000 -0500
-+++ rpm-4.6.0/rpmrc.in	2009-03-11 11:50:49.000000000 -0500
-@@ -312,7 +312,7 @@
+ #	if defined(__linux__) && defined(__powerpc__)
+diff -up rpm-4.9.1.3/rpmrc.in.niagara rpm-4.9.1.3/rpmrc.in
+--- rpm-4.9.1.3/rpmrc.in.niagara	2012-04-19 17:06:23.131476769 +0200
++++ rpm-4.9.1.3/rpmrc.in	2012-04-19 17:06:23.135738996 +0200
+@@ -316,7 +316,7 @@ arch_compat: sun4c: sparc
  arch_compat: sun4d: sparc
  arch_compat: sun4m: sparc
  arch_compat: sun4u: sparc64


More information about the scm-commits mailing list