[rpm] - fix base arch macro generation (#808250)

[Panu Matilainen]

commit f097c8059c7b4dea750e75909eb7351b939fe831
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Fri Mar 30 10:08:08 2012 +0300

    - fix base arch macro generation (#808250)

 rpm-4.9.90-canonarch.patch |   24 ++++++++++++++++++++++++
 rpm.spec                   |    7 ++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/rpm-4.9.90-canonarch.patch b/rpm-4.9.90-canonarch.patch
new file mode 100644
index 0000000..3883517
--- /dev/null
+++ b/rpm-4.9.90-canonarch.patch
@@ -0,0 +1,24 @@
+commit 2e5d83e3d1a27044ee59f13f66b06e9011d1ac9f
+Author: Panu Matilainen <pmatilai at redhat.com>
+Date:   Fri Mar 30 09:56:43 2012 +0300
+
+    Axe leftover CANONARCH assignment messing up our "base" archs (RhBug:808250)
+    
+    - This should've been in commit 2a8d03669732f68f02fa7b21ec87ee3f65d11e5b,
+      the leftover CANONARCH resets the "base arch" we just set to a wrong
+      value.
+    (cherry picked from commit 7c39c65da4b1b012061ffbac179a650643d00ba9)
+
+diff --git a/installplatform b/installplatform
+index c56d5665..f7ae241 100755
+--- a/installplatform
++++ b/installplatform
+@@ -111,8 +111,6 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
+   # skip architectures for which we dont have full config parameters
+   [ -z "$CANONARCH" ] && continue
+ 
+-  CANONARCH="`echo $ARCH|sed -e "$canonarch_sed"`"
+-
+   if [ "$OS" = "linux" ] && [ "$CANONCOLOR" = 3 ]; then
+       LIB=${LIB}64
+   fi
diff --git a/rpm.spec b/rpm.spec
index 794d50a..e1e1ae4 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -22,7 +22,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}9%{?dist}
+Release: %{?snapver:0.%{snapver}.}10%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -49,6 +49,7 @@ Patch201: rpm-4.9.90-rpmte-fileinfo-2.patch
 Patch202: rpm-4.9.90-keyid-size.patch
 Patch203: rpm-4.9.90-header-datalength.patch
 Patch204: rpm-4.9.90-rpmdeps-args.patch
+Patch205: rpm-4.9.90-canonarch.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -223,6 +224,7 @@ packages on a system.
 %patch202 -p1 -b .keyid-size
 %patch203 -p1 -b .header-datalength
 %patch204 -p1 -b .rpmdeps-args
+%patch205 -p1 -b .canonarch
 
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
@@ -449,6 +451,9 @@ exit 0
 %doc COPYING doc/librpm/html/*
 
 %changelog
+* Fri Mar 30 2012 Panu Matilainen <pmatilai at redhat.com> - 4.9.90-0.git11505.10
+- fix base arch macro generation (#808250)
+
 * Thu Mar 29 2012 Panu Matilainen <pmatilai at redhat.com> - 4.9.90-0.git11505.9
 - accept files as command line arguments to rpmdeps again (#807767)