From c880e47adde5db41d78d2986c086b3608c1fea0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 14 Sep 2013 20:48:06 +0200 Subject: [PATCH] list files again to avoid owning standard dirs in RPM reverts commit 9d256d93a59302c06d26f36c88125ce574d7e360 fixes file /usr/bin from install of openra-release.20130915-1.noarch conflicts with file from package filesystem-3.2-13.fc19.x86_64 --- packaging/linux/rpm/buildpackage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh index 9fb62de211..5b4d36e421 100755 --- a/packaging/linux/rpm/buildpackage.sh +++ b/packaging/linux/rpm/buildpackage.sh @@ -13,7 +13,7 @@ sed -i "s/{VERSION_FIELD}/$PKGVERSION/" openra.spec rootdir=`readlink -f $2` sed -i "s|{ROOT_DIR}|$rootdir|" openra.spec -for x in `find $rootdir -type d` +for x in `find $rootdir -type f` do y="${x#$rootdir}" sed -i "/%files/ a ${y}" openra.spec