From 8a279bb5a2abae35d48a4f8aa3bf70303a906887 Mon Sep 17 00:00:00 2001
From: Pete Fritchman <petef@databits.net>
Date: Fri, 18 Nov 2011 18:01:19 -0800
Subject: [PATCH] support rpm building from a top-level checkout dir with any
 name

---
 scripts/rpmbuild.sh | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/scripts/rpmbuild.sh b/scripts/rpmbuild.sh
index c749d7c0f..465ad047d 100755
--- a/scripts/rpmbuild.sh
+++ b/scripts/rpmbuild.sh
@@ -6,17 +6,14 @@ progname=$(basename $0)
 
 cd $(dirname $0)/..    # top level of the checkout
 
-curdir=$(basename $PWD)
-if [ "$curdir" != "browserid" ]; then
-    echo "$progname: git checkout must be in a dir named 'browserid'" >&2
-    exit 1
-fi
-
-mkdir -p rpmbuild/SOURCES rpmbuild/SPECS
-rm -rf rpmbuild/RPMS
-
-tar -C .. --exclude rpmbuild -czf \
-    $PWD/rpmbuild/SOURCES/browserid-server.tar.gz browserid
+mkdir -p rpmbuild/SOURCES rpmbuild/SPECS rpmbuild/SOURCES
+rm -rf rpmbuild/RPMS rpmbuild/SOURCES/browserid
+
+# work around the checkout name not being "browserid"
+ln -sf $PWD rpmbuild/SOURCES/browserid
+tar -C rpmbuild/SOURCES --exclude rpmbuild --exclude .git \
+    --exclude var -czhf \
+    $PWD/rpmbuild/SOURCES/browserid-server.tar.gz browserid/
 
 set +e
 
-- 
GitLab