From 7402f8e4f7bd61aebb3d4a42e16979b473f8749a Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Tue, 8 Feb 2011 16:32:01 +1300
Subject: [PATCH] Follow suit with rpm and arch packages. Untested.

---
 packaging/linux/buildpackage.sh | 4 ++--
 packaging/upload-all.sh         | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
index e38757fe10..6b2cc99978 100644
--- a/packaging/linux/buildpackage.sh
+++ b/packaging/linux/buildpackage.sh
@@ -41,7 +41,7 @@ cp -r hicolor $ROOTDIR/usr/share/icons/
 (
     echo "Building Arch-Linux package."
     cd pkgbuild
-    sh buildpackage.sh "$VERSION" ../$ROOTDIR "$PACKAGEDIR" &> package.log
+    sh buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR" &> package.log
     if [ $? -ne 0 ]; then
         echo "Arch-Linux package build failed, refer to $PWD/package.log."
     fi
@@ -50,7 +50,7 @@ cp -r hicolor $ROOTDIR/usr/share/icons/
 (
     echo "Building RPM package."
     cd rpm
-    sh buildpackage.sh "$VERSION" ../$ROOTDIR ~/rpmbuild "$PACKAGEDIR" &> package.log
+    sh buildpackage.sh "$TAG" ../$ROOTDIR ~/rpmbuild "$PACKAGEDIR" &> package.log
     if [ $? -ne 0 ]; then
         echo "RPM package build failed, refer to $PWD/package.log."
     fi
diff --git a/packaging/upload-all.sh b/packaging/upload-all.sh
index 51708b32a6..5defc4472c 100755
--- a/packaging/upload-all.sh
+++ b/packaging/upload-all.sh
@@ -11,18 +11,13 @@ upload () {
 
 TAG=$1
 PKGDIR=$2
-TYPE=`echo ${TAG} | grep -o "^[a-z]\\+"`
-VERSION=`echo ${TAG} | grep -o "[0-9]\\+-\\?[0-9]\\?"`
 LINUXVERSION=`echo ${TAG} | sed "s/-/\\./g"`
 
 cd ${PKGDIR}
 upload windows OpenRA-${TAG}.exe
 upload mac OpenRA-${TAG}.zip
 upload linux/deb openra_${LINUXVERSION}_all.deb
-
-mv openra-${VERSION}-1.noarch.rpm openra-${TYPE}${VERSION}-1.noarch.rpm
-upload linux/rpm openra-${TYPE}${VERSION}-1.noarch.rpm
-mv openra-${VERSION}-1-any.pkg.tar.xz openra-${TYPE}${VERSION}-1-any.pkg.tar.xz
-upload linux/arch openra-${TYPE}${VERSION}-1-any.pkg.tar.xz
+upload linux/rpm openra-${LINUXVERSION}-1.noarch.rpm
+upload linux/arch openra-${LINUXVERSION}-1-any.pkg.tar.xz
 
 wget http://${FTPSERVER}/home/syncdownloads