You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/08/23 14:33:38 UTC

git commit: updated refs/heads/master to 658844e

Updated Branches:
  refs/heads/master 7d4a57563 -> 658844ea9


Minor fix to package.sh, this prevented packages to be build for releases


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/658844ea
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/658844ea
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/658844ea

Branch: refs/heads/master
Commit: 658844ea99ebd284ed7f74b5bae4c94614acb3cc
Parents: 7d4a575
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Aug 23 14:28:47 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Aug 23 14:31:43 2013 +0200

----------------------------------------------------------------------
 packaging/centos63/package.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/658844ea/packaging/centos63/package.sh
----------------------------------------------------------------------
diff --git a/packaging/centos63/package.sh b/packaging/centos63/package.sh
index ec56c0f..eae05de 100755
--- a/packaging/centos63/package.sh
+++ b/packaging/centos63/package.sh
@@ -37,11 +37,11 @@ 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`
   DEFVER="-D_ver $REALVER"
   DEFPRE=
   DEFREL="-D_rel 1"
@@ -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} -ba SPECS/cloud.spec)
 
 exit
 }