From af0f8d09d620b385c47f988c26e0836ddac4746e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sat, 19 Oct 2013 13:10:33 +0200
Subject: [PATCH] simplify RPM buildpackage script for the build server

hard-code everything outside /usr/share/openra
---
 packaging/linux/rpm/buildpackage.sh | 27 ++-------------------------
 packaging/linux/rpm/openra.spec     |  6 +++++-
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh
index b23705c6e3..b640d3fdde 100755
--- a/packaging/linux/rpm/buildpackage.sh
+++ b/packaging/linux/rpm/buildpackage.sh
@@ -13,32 +13,10 @@ sed -i "s/{VERSION_FIELD}/$PKGVERSION/" openra.spec
 rootdir=`readlink -f $2`
 sed -i "s|{ROOT_DIR}|$rootdir|" openra.spec
 
-# List files to avoid owning standard dirs.
-`find $rootdir/usr/bin -type f -print0` | xargs -0 -n 1 echo | while read x
+for x in `find $rootdir/usr/share/openra -type d`
 do
     y="${x#$rootdir}"
-    sed -i "/%files/ a \"${y}\"" openra.spec
-done
-
-`find $rootdir/usr/share/icons -type f -print0` | xargs -0 -n 1 echo | while read x
-do
-    y="${x#$rootdir}"
-    sed -i "/%files/ a \"${y}\"" openra.spec
-done
-
-`find $rootdir/usr/share/applications -type f -print0` | \
-                                  xargs -0 -n 1 echo | \
-                                  while read x
-do
-    y="${x#$rootdir}"
-    sed -i "/%files/ a \"${y}\"" openra.spec
-done
-
-# List directories only to avoid spam
-`find $rootdir/usr/share/openra -type d -print0` | xargs -0 -n 1 echo | while read x
-do
-    y="${x#$rootdir}"
-    sed -i "/%files/ a \"${y}\"" openra.spec
+    sed -i "/%files/ a ${y}" openra.spec
 done
 
 cp openra.spec "$3/SPECS/"
@@ -52,4 +30,3 @@ fi
 
 cd RPMS/noarch/
 mv openra-$PKGVERSION-1.noarch.rpm $4
-
diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec
index 4167a08faa..4521f6b111 100644
--- a/packaging/linux/rpm/openra.spec
+++ b/packaging/linux/rpm/openra.spec
@@ -23,9 +23,13 @@ and includes Command & Conquer: Tiberian Dawn as an official mod.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cp -r %{root} $RPM_BUILD_ROOT 
+cp -r %{root} $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
+/usr/bin/openra
+/usr/bin/openra-editor
+/usr/share/applications/*.desktop
+/usr/share/icons/hicolor/*/apps/*.png
\ No newline at end of file