From cec0986bf8a74007e4eb17165acb0bd890de7cd4 Mon Sep 17 00:00:00 2001
From: Pete Fritchman <petef@databits.net>
Date: Sun, 4 Dec 2011 10:41:20 -0800
Subject: [PATCH] rpm fix: don't clobber the checkout with build artifacts
 (symlink trick was causing this)

---
 scripts/browserid.spec | 5 ++---
 scripts/rpmbuild.sh    | 8 +++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/scripts/browserid.spec b/scripts/browserid.spec
index c0430e1b1..1e5dd80eb 100644
--- a/scripts/browserid.spec
+++ b/scripts/browserid.spec
@@ -18,13 +18,12 @@ BuildRequires: gcc-c++ git jre make npm openssl-devel
 browserid server & web home for browserid.org
 
 %prep
-%setup -q -n browserid
+%setup -q -c -n browserid
 
 %build
-rm -rf node_modules/jwcrypto
 npm install
 export PATH=$PWD/node_modules/.bin:$PATH
-(scripts/compress.sh)
+scripts/compress.sh
 echo "$GIT_REVISION" > resources/static/ver.txt
 
 %install
diff --git a/scripts/rpmbuild.sh b/scripts/rpmbuild.sh
index 465ad047d..e8fa67d5d 100755
--- a/scripts/rpmbuild.sh
+++ b/scripts/rpmbuild.sh
@@ -9,11 +9,9 @@ cd $(dirname $0)/..    # top level of the checkout
 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/
+tar --exclude rpmbuild --exclude .git \
+    --exclude var -czf \
+    $PWD/rpmbuild/SOURCES/browserid-server.tar.gz .
 
 set +e
 
-- 
GitLab