Updated Branches: refs/heads/master fb9ceba93 -> 58638558a
Minor fixes to packaging.sh, now also works (again) with snapshot build Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/58638558 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/58638558 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/58638558 Branch: refs/heads/master Commit: 58638558a450eb1e834a04ca7c8c9cf1d8eaa267 Parents: fb9ceba Author: Hugo Trippaers <[email protected]> Authored: Fri Aug 23 16:55:40 2013 +0200 Committer: Hugo Trippaers <[email protected]> Committed: Fri Aug 23 17:11:25 2013 +0200 ---------------------------------------------------------------------- packaging/centos63/package.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/58638558/packaging/centos63/package.sh ---------------------------------------------------------------------- diff --git a/packaging/centos63/package.sh b/packaging/centos63/package.sh index eae05de..f30a0e7 100755 --- a/packaging/centos63/package.sh +++ b/packaging/centos63/package.sh @@ -37,13 +37,13 @@ PACK_PROJECT=cloudstack VERSION=`(cd ../../; mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version) | grep '^[0-9]\.'` if echo $VERSION | grep SNAPSHOT ; then + REALVER=`echo $VERSION | cut -d '-' -f 1` DEFVER="-D_ver $REALVER" DEFPRE="-D_prerelease 1" DEFREL="-D_rel SNAPSHOT" else - REALVER=`echo $VERSION | cut -d '-' -f 1` + REALVER=$VERSION DEFVER="-D_ver $REALVER" - DEFPRE= DEFREL="-D_rel 1" fi @@ -58,7 +58,7 @@ mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION cp cloud.spec $RPMDIR/SPECS -(cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" ${DEFVER} ${DEFREL} ${DEFPRE} -ba SPECS/cloud.spec) +(cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+"${DEFPRE}"} -ba SPECS/cloud.spec) exit } @@ -80,7 +80,6 @@ if echo $VERSION | grep SNAPSHOT ; then else REALVER=`echo $VERSION` DEFVER="-D_ver $REALVER" - DEFPRE= DEFREL="-D_rel 1" fi @@ -96,7 +95,7 @@ mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION cp cloud.spec $RPMDIR/SPECS -(cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "$DEFVER" "$DEFREL" "$DEFPRE" "$DEFOSSNOSS" -bb SPECS/cloud.spec) +(cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+\"${DEFPRE}\"} "${DEFOSSNOSS}" -bb SPECS/cloud.spec) exit }
