From eb158e6d218889683867c7780352a3b851b44dd0 Mon Sep 17 00:00:00 2001
From: Matthew Bowra-Dean <matthew@ijw.co.nz>
Date: Wed, 5 Jan 2011 14:14:34 +1300
Subject: [PATCH] pkgbuild and RPM fixes

---
 packaging/linux/pkgbuild/buildpackage.sh | 12 +++++++-----
 packaging/linux/rpm/buildpackage.sh      | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/packaging/linux/pkgbuild/buildpackage.sh b/packaging/linux/pkgbuild/buildpackage.sh
index 5d790073b6..35e23ce03f 100755
--- a/packaging/linux/pkgbuild/buildpackage.sh
+++ b/packaging/linux/pkgbuild/buildpackage.sh
@@ -16,12 +16,14 @@ fi
 # Replace any dashes in the version string with periods
 PKGVERSION=`echo $1 | sed "s/-/\\./g"`
 
-sed -i "s/{VERSION}/$PKGVERSION/" PKGBUILD
-rootdir=`readlink -f $2`
-sed -i "s|{ROOT}|$rootdir|" PKGBUILD
-sed -i "s/{ARCH}/$ARCH/" PKGBUILD
+cp PKGBUILD PKGBUILD$ARCH
 
-makepkg --holdver
+sed -i "s/{VERSION}/$PKGVERSION/" PKGBUILD$ARCH
+rootdir=`readlink -f $2`
+sed -i "s|{ROOT}|$rootdir|" PKGBUILD$ARCH
+sed -i "s/{ARCH}/$ARCH/" PKGBUILD$ARCH
+
+makepkg --holdver -p PKGBUILD$ARCH
 if [ $? -ne 0 ]; then
   exit 1
 fi
diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh
index e0b2a8e665..9409c84714 100755
--- a/packaging/linux/rpm/buildpackage.sh
+++ b/packaging/linux/rpm/buildpackage.sh
@@ -16,21 +16,23 @@ fi
 # Replace any dashes in the version string with periods
 PKGVERSION=`echo $1 | sed "s/-/\\./g"`
 
-sed -i "s/{VERSION_FIELD}/$PKGVERSION/" openra.spec
+cp openra.spec openra$ARCH.spec
+
+sed -i "s/{VERSION_FIELD}/$PKGVERSION/" openra$ARCH.spec
 rootdir=`readlink -f $2`
-sed -i "s|{ROOT_DIR}|$rootdir|" openra.spec
+sed -i "s|{ROOT_DIR}|$rootdir|" openra$ARCH.spec
 
 for x in `find $rootdir -type f`
 do
     y="/${x#$rootdir}"
-    sed -i "/%files/ a $y" openra.spec
+    sed -i "/%files/ a $y" openra$ARCH.spec
 done
 
-cp openra.spec "$3/SPECS/"
+cp openra$ARCH.spec "$3/SPECS/"
 
 cd "$3"
 
-rpmbuild --target $ARCH -bb SPECS/openra.spec
+rpmbuild --target $ARCH -bb SPECS/openra$ARCH.spec
 if [ $? -ne 0 ]; then
   exit 1
 fi