From 2885fbb99bf91f29df6f9f8fd84d277bdcfe54c1 Mon Sep 17 00:00:00 2001
From: Matthew Bowra-Dean <matthew@ijw.co.nz>
Date: Tue, 4 Jan 2011 18:00:31 +1300
Subject: [PATCH] Few more tweaks to packaging

---
 packaging/linux/deb/DEBIAN/control  | 2 +-
 packaging/linux/rpm/buildpackage.sh | 2 +-
 packaging/upload-all.sh             | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packaging/linux/deb/DEBIAN/control b/packaging/linux/deb/DEBIAN/control
index eeb8fe9cd7..a21e0d7639 100644
--- a/packaging/linux/deb/DEBIAN/control
+++ b/packaging/linux/deb/DEBIAN/control
@@ -1,6 +1,6 @@
 Package: openra
 Version: {VERSION}
-Architecture: i686
+Architecture: i386
 Maintainer: Matthew Bowra-Dean <matthew@ijw.co.nz>
 Uploaders: Maikel van den Hout <ma1kelvdh@gmail.com>, Paul Chote <sleipnir@sleipnirstuff.com>
 Installed-Size: {SIZE}	
diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh
index 84eb4c3165..4e1d593f41 100755
--- a/packaging/linux/rpm/buildpackage.sh
+++ b/packaging/linux/rpm/buildpackage.sh
@@ -28,6 +28,6 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
-cd RPMS/noarch/
+cd RPMS/i686/
 mv openra-$PKGVERSION-1.i686.rpm $4
 
diff --git a/packaging/upload-all.sh b/packaging/upload-all.sh
index c71891958c..ac80d1a1e1 100755
--- a/packaging/upload-all.sh
+++ b/packaging/upload-all.sh
@@ -26,11 +26,11 @@ esac
 LINUXVERSION=`echo $VERSION | sed "s/-/\\./g"`
 
 ./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION.deb "deblatest" "$FTPSERVER" "$FTPPATH" "$3" "$4"
-./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1.noarch.rpm "rpmlatest" "$FTPSERVER" "$FTPPATH" "$3" "$4"
-./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1-any.pkg.tar.xz "archlatest" "$FTPSERVER" "$FTPPATH" "$3" "$4"
+./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1.i686.rpm "rpmlatest" "$FTPSERVER" "$FTPPATH" "$3" "$4"
+./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1-i686.pkg.tar.xz "archlatest" "$FTPSERVER" "$FTPPATH" "$3" "$4"
 
 if [ "$TYPE" = "release" ]; then
     wput --basename=../ -u ../VERSION ftp://$3:$4@$FTPSERVER/$FTPPATHBASE/master/
     cp ../VERSION ../srclatest.txt
     wput --basename=../ -u ../srclatest.txt ftp://$3:$4@$FTPSERVER/$FTPPATH/linux/
-fi
\ No newline at end of file
+fi