SOURCES (AC-branch): rpm-amd64.patch - missing parts from amd64 br...

[arekm]

Author: arekm                        Date: Sat Jun 18 11:58:42 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- missing parts from amd64 branch

---- Files affected:
SOURCES:
   rpm-amd64.patch (1.4.4.2 -> 1.4.4.3) 

---- Diffs:

================================================================
Index: SOURCES/rpm-amd64.patch
diff -u SOURCES/rpm-amd64.patch:1.4.4.2 SOURCES/rpm-amd64.patch:1.4.4.3
--- SOURCES/rpm-amd64.patch:1.4.4.2	Sat Jun 18 00:27:07 2005
+++ SOURCES/rpm-amd64.patch	Sat Jun 18 13:58:37 2005
@@ -1,7 +1,7 @@
-diff -urN rpm.org/build/parseSpec.c rpm/build/parseSpec.c
---- rpm.org/build/parseSpec.c	2004-06-14 14:52:54.433793272 +0200
-+++ rpm/build/parseSpec.c	2004-06-14 14:55:21.399451096 +0200
-@@ -227,6 +227,15 @@
+diff -urbB rpm-4.4.1.org/build/parseSpec.c rpm-4.4.1/build/parseSpec.c
+--- rpm-4.4.1.org/build/parseSpec.c	2005-06-18 13:56:00.311780000 +0200
++++ rpm-4.4.1/build/parseSpec.c	2005-06-18 13:56:29.453350760 +0200
+@@ -233,6 +233,15 @@
      return 0;
  }
  /*@=boundswrite@*/
@@ -17,7 +17,7 @@
  
  /*@-boundswrite@*/
  int readLine(Spec spec, int strip)
-@@ -319,13 +328,15 @@
+@@ -325,13 +334,15 @@
  	match = 0;
      } else if (! strncmp("%ifarch", s, sizeof("%ifarch")-1)) {
  	const char *arch = rpmExpand("%{_target_cpu}", NULL);
@@ -35,10 +35,21 @@
  	arch = _free(arch);
      } else if (! strncmp("%ifos", s, sizeof("%ifos")-1)) {
  	const char *os = rpmExpand("%{_target_os}", NULL);
-diff -urN rpm.org/lib/rpmrc.c rpm/lib/rpmrc.c
---- rpm.org/lib/rpmrc.c	2004-06-14 14:53:19.117040848 +0200
-+++ rpm/lib/rpmrc.c	2004-06-14 14:55:21.421447752 +0200
-@@ -1319,6 +1319,13 @@
+diff -urbB rpm-4.4.1.org/installplatform rpm-4.4.1/installplatform
+--- rpm-4.4.1.org/installplatform	2005-01-26 04:39:54.000000000 +0100
++++ rpm-4.4.1/installplatform	2005-06-18 13:57:16.874141704 +0200
+@@ -31,6 +31,7 @@
+ 
+ case "$arch" in
+   i[3456]86|pentium[34]|athlon) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_pentium3_ s_i386_pentium4_ s_i386_athlon_' ;;
++  x86_64*|amd64*) SUBSTS="s/${arch}/x86_64/ s/${arch}/amd64/" ;;
+   alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;;
+   sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;;
+   powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_' ;;
+diff -urbB rpm-4.4.1.org/lib/rpmrc.c rpm-4.4.1/lib/rpmrc.c
+--- rpm-4.4.1.org/lib/rpmrc.c	2005-06-18 13:56:00.382770000 +0200
++++ rpm-4.4.1/lib/rpmrc.c	2005-06-18 13:56:29.454350608 +0200
+@@ -1329,6 +1329,13 @@
  	}
  #	endif
  
@@ -52,10 +63,10 @@
  #	if defined(__linux__) && defined(__powerpc__)
  	{
  	    unsigned pvr = 0;
-diff -urN rpm.org/rpmrc.in rpm/rpmrc.in
---- rpm.org/rpmrc.in	2004-06-14 14:53:29.723428432 +0200
-+++ rpm/rpmrc.in	2004-06-14 14:58:38.156539472 +0200
-@@ -272,9 +272,9 @@
+diff -urbB rpm-4.4.1.org/rpmrc.in rpm-4.4.1/rpmrc.in
+--- rpm-4.4.1.org/rpmrc.in	2005-06-18 13:56:00.305781000 +0200
++++ rpm-4.4.1/rpmrc.in	2005-06-18 13:56:29.455350456 +0200
+@@ -230,9 +230,9 @@
  
  buildarchtranslate: ia64: ia64
  
@@ -68,3 +79,4 @@
  
  #############################################################
  # Architecture compatibility
+Tylko w rpm-4.4.1: rpmrc.in.orig
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-amd64.patch?r1=1.4.4.2&r2=1.4.4.3&f=u