Merge pull request #705 from fetep/fixes/rpmbuild

some rpmbuild fixes

Makefile

+clean:
+	rm -rf node_modules rpmbuild
+
+npm:
+	npm install
+
+rpm: npm
+	scripts/rpmbuild.sh
+
+test: npm
+	npm test
+
+jenkins_build: clean npm test rpm

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

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