rpms/rpm/devel rpm-4.4.2.3-geode-instplat.patch, NONE, 1.1 rpm.spec, 1.276, 1.277

[Panu Matilainen (pmatilai)]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13549

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.4.2.3-geode-instplat.patch 
Log Message:
- some minor bits missing from geode support breaking builds...


rpm-4.4.2.3-geode-instplat.patch:

--- NEW FILE rpm-4.4.2.3-geode-instplat.patch ---
changeset:   6240:77473bfeaa7a
tag:         tip
user:        Panu Matilainen <pmatilai at redhat.com>
date:        Fri Jan 25 17:33:35 2008 +0200
files:       installplatform
description:
Urgh, add geode to x86_64 secondary arch subst-crack...
(transplanted from 1196f54f1c475819b16c419f3f060c9fe3ff1e91)


diff -r 8e1c3b69d2af -r 77473bfeaa7a installplatform
--- a/installplatform	Fri Jan 25 14:08:27 2008 +0200
+++ b/installplatform	Fri Jan 25 17:33:35 2008 +0200
@@ -36,7 +36,7 @@ case "$arch" in
   sparc*) SUBSTS='s_sparc\(64\|64v\|v9v\|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_' ;;
   s390*) SUBSTS='s_s390x_s390_ s_s390\([^x]\|$\)_s390x\1_' ;;
-  x86_64|amd64|ia32e) SUBSTS='s,x86_64,x86_64, s,x86_64,ia32e, s,x86_64,amd64, s,x86_64,i386, s,x86_64,i486, s,x86_64,i586, s,x86_64,i686, s,x86_64,pentium3, s,x86_64,pentium4, s,x86_64,athlon,' ;;
+  x86_64|amd64|ia32e) SUBSTS='s,x86_64,x86_64, s,x86_64,ia32e, s,x86_64,amd64, s,x86_64,i386, s,x86_64,i486, s,x86_64,i586, s,x86_64,i686, s,x86_64,pentium3, s,x86_64,pentium4, s,x86_64,athlon, s,x86_64,geode,' ;;
   *) SUBSTS=y___ ;;
 esac
 



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- rpm.spec	25 Jan 2008 15:17:21 -0000	1.276
+++ rpm.spec	25 Jan 2008 15:47:50 -0000	1.277
@@ -22,6 +22,8 @@
 Patch10: rpm-4.4.2.2-pkgconfig-path.patch
 Patch11: rpm-4.4.2.3-queryformat-arch.patch
 
+Patch50: rpm-4.4.2.3-geode-instplat.patch
+
 # XXX Beware, this is one murky license, partially GPL/LGPL dual-licensed
 # and several different components with their own licenses included...
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD and MIT and Sleepycat
@@ -144,6 +146,8 @@
 %patch10 -p1 -b .pkgconfig-path
 %patch11 -p1 -b .qfmt-arch
 
+%patch50 -p1 -b .geode-instplat
+
 # force external popt
 rm -rf popt/
 
@@ -279,9 +283,10 @@
 %{rpmhome}/rpmpopt*
 %{rpmhome}/rpmrc
 
-%ifarch i386 i486 i586 i686 athlon pentium3 pentium4 x86_64
+%ifarch i386 i486 i586 i686 athlon geode pentium3 pentium4 x86_64
 %{rpmhome}/i[3456]86*
 %{rpmhome}/athlon*
+%{rpmhome}/geode*
 %{rpmhome}/pentium*
 %endif
 %ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67