epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure build root is correct (no override from rpmmacros).

Browse Source
This commit is contained in:
Matthew Bowra-Dean
2011-01-05 15:01:04 +13:00
parent a993116085
commit 63ee3ebf9f
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packaging/linux/rpm/buildpackage.sh
View File

@@ -21,7 +21,6 @@ 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$ARCH.spec
sed -i "s/{ARCH}/$ARCH/" openra$ARCH.spec
for x in `find $rootdir -type f`
do
@@ -33,7 +32,7 @@ cp openra$ARCH.spec "$3/SPECS/"
cd "$3"
rpmbuild --target $ARCH -bb SPECS/openra$ARCH.spec
rpmbuild --target $ARCH --buildroot /tmp/openra$ARCH/ -bb SPECS/openra$ARCH.spec
if [ $? -ne 0 ]; then
exit 1
fi

2
packaging/linux/rpm/openra.spec
View File

@@ -12,7 +12,7 @@ Packager: Matthew Bowra-Dean <matthew@ijw.co.nz>
Requires: mono-core mono-devel SDL openal mesa-dri-drivers-experimental gtk2 webkitgtk
Prefix: /usr
Source: %{name}-%{version}.tar.gz
Buildroot: /tmp/openra{ARCH}
Buildroot: /tmp/openra
%description
A multiplayer reimplementation of the Command & Conquer: Red Alert game

2
packaging/upload-all.sh
View File

@@ -26,7 +26,7 @@ esac
LINUXVERSION=`echo $VERSION | sed "s/-/\\./g"`
./uploader.sh linux "$VERSION" $PKGDIR/openra-$VERSION-i386.deb "deblatest32" "$FTPSERVER" "$FTPPATH" "$3" "$4"
./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1.i686.rpm "rpmlatest32" "$FTPSERVER" "$FTPPATH" "$3" "$4"
./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1.i386.rpm "rpmlatest32" "$FTPSERVER" "$FTPPATH" "$3" "$4"
./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1-i686.pkg.tar.xz "archlatest32" "$FTPSERVER" "$FTPPATH" "$3" "$4"
./uploader.sh linux "$VERSION" $PKGDIR/openra-$VERSION-amd64.deb "deblatest" "$FTPSERVER" "$FTPPATH" "$3" "$4"
./uploader.sh linux "$VERSION" $PKGDIR/openra-$LINUXVERSION-1.x86_64.rpm "rpmlatest" "$FTPSERVER" "$FTPPATH" "$3" "$4"