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

fix rpmbuild warning: File listed twice

Browse Source
This commit is contained in:
Matthias Mailänder
2014-06-05 14:36:37 +02:00
parent 92e5ea42db
commit 66bc649d75
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,17 +16,11 @@ sed -i "s/{VERSION_FIELD}/$PKGVERSION/" openra.spec
rootdir=`readlink -f $2` rootdir=`readlink -f $2`
sed -i "s|{ROOT_DIR}|$rootdir|" openra.spec sed -i "s|{ROOT_DIR}|$rootdir|" openra.spec
for x in `find $rootdir/usr/lib/openra -type d`
do
y="${x#$rootdir}"
sed -i "/%files/ a ${y}" openra.spec
done
cp openra.spec "$3/SPECS/" cp openra.spec "$3/SPECS/"
cd "$3" cd "$3"
rpmbuild --target noarch --buildroot /tmp/openra/ -bb SPECS/openra.spec --quiet rpmbuild --target noarch --buildroot /tmp/openra/ -bb SPECS/openra.spec
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi

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

@@ -47,6 +47,7 @@ rm -rf %{buildroot}
%files %files
/usr/bin/openra /usr/bin/openra
/usr/bin/openra-editor /usr/bin/openra-editor
/usr/lib/openra/
/usr/share/applications/*.desktop /usr/share/applications/*.desktop
/usr/share/doc/openra/* /usr/share/doc/openra/*
/usr/share/icons/hicolor/*/apps/*.png /usr/share/icons/hicolor/*/apps/*.png