[X2Go-Commits] [buildscripts] 01/01: fix for last commit

git-admin at x2go.org git-admin at x2go.org
Wed Feb 4 23:48:22 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 5dd3bd2bf948bc97c5c309666e55ff074654a9ee
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 4 23:48:17 2015 +0100

    fix for last commit
---
 bin/build-rpm-package |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index ffde823..3ae5b2c 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -74,6 +74,7 @@ set_vars() {
 		CHECKOUT="${3:-build-main}"
 	elif [ "x$COMPONENT" = "x${COMPONENT_MAIN}-test" ]; then
 		CHECKOUT="${3:-build-main-test}"
+		COMPONENT="maintest"
 	elif echo "$COMPONENT_RELEASES" | grep "$COMPONENT" >/dev/null; then
 		CHECKOUT="${3:-build-$COMPONENT}"
 	elif [ "x$COMPONENT" = "x$COMPONENT_NIGHTLY" ]; then
@@ -187,7 +188,7 @@ build_packages() {
 				mv $PROJECT/$PROJECT.spec .
 
 				UPSTREAM_VERSION=$(cat $PROJECT.spec | egrep "^Version:.*" | awk '{ print $2 }')
-				PKG_RELEASE=$(cat $PROJECT.spec | egrep "^Release:.*" | awk '{ print $2 }' | sed 's/-//')
+				PKG_RELEASE=$(cat $PROJECT.spec | egrep "^Release:.*" | awk '{ print $2 }')
 				PKG_SRCRELEASE=$(echo $PKG_RELEASE | sed -e 's/%{?dist}//')
 
 				IS_NOARCH=$(cat $PROJECT.spec | egrep "^BuildArch:.*noarch\$" 1>/dev/null 2>/dev/null && echo yes || echo no)

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git


More information about the x2go-commits mailing list