From 55dc4c2d83213b583b51a3ee9ea69ae3092ca18c Mon Sep 17 00:00:00 2001 From: Shlomi Livne Date: Sat, 19 Sep 2015 00:12:00 +0300 Subject: [PATCH] dist: rpmbuild builds source rpm, mock builds binary rpm - no need to create the binary rpm twice - we are using the mock version - this is causing issues on jenkins as we build rpms on it only via mock Signed-off-by: Shlomi Livne --- dist/redhat/build_rpm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/redhat/build_rpm.sh b/dist/redhat/build_rpm.sh index a8fb7bebed..831aa3fd19 100755 --- a/dist/redhat/build_rpm.sh +++ b/dist/redhat/build_rpm.sh @@ -19,5 +19,5 @@ rm -f version cp dist/redhat/scylla-server.spec.in $RPMBUILD/SPECS/scylla-server.spec sed -i -e "s/@@VERSION@@/$SCYLLA_VERSION/g" $RPMBUILD/SPECS/scylla-server.spec sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/g" $RPMBUILD/SPECS/scylla-server.spec -rpmbuild -bs --define "_topdir $RPMBUILD" -ba $RPMBUILD/SPECS/scylla-server.spec +rpmbuild -bs --define "_topdir $RPMBUILD" $RPMBUILD/SPECS/scylla-server.spec mock rebuild --resultdir=`pwd`/build/rpms $RPMBUILD/SRPMS/scylla-server-$VERSION*.src.rpm