[X2Go-Commits] buildscripts.git - master (branch) updated: c97c287b3b500b11994850d86ea418fc95d355e2

[X2Go dev team]

The branch, master has been updated
       via  c97c287b3b500b11994850d86ea418fc95d355e2 (commit)
      from  85abe1d256507bc63266e4a039ef055a0d3a8d9d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c97c287b3b500b11994850d86ea418fc95d355e2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 29 15:09:46 2013 +0100

    introduce new var: PKG_SRCRELEASE, with %{?dist} macro strippped off

-----------------------------------------------------------------------

Summary of changes:
 bin/build-rpm-package |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index f70004c..4c1ef4f 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -189,6 +189,7 @@ build_packages() {
 
 	UPSTREAM_VERSION=$(cat $PROJECT.spec | egrep "^Version:.*" | awk '{ print $2 }')
 	PKG_RELEASE=$(cat $PROJECT.spec | egrep "^Release:.*" | awk '{ print $2 }')
+	PKG_SRCRELEASE=$(echo $PKG_RELEASE | sed -e 's/%{?dist}//')
 
 	GITREV=$(cd $PROJECT && gitrevno && cd - 1>/dev/null)
 
@@ -245,7 +246,7 @@ build_packages() {
 					### TODO: build amd64/i386 packages here
 
 					[ "x$SKIP_ARCH" != "xamd64" ] && {
-						mock -r ${l_DIST}-${l_CODENAME}-x86_64 ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_RELEASE.src.rpm
+						mock -r ${l_DIST}-${l_CODENAME}-x86_64 ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.src.rpm
 					}
 					#[ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
 					#	DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386  $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386"  -- --binary-arch --allow-untrusted $SA_OPTION 0<&-


hooks/post-receive
-- 
buildscripts.git (X2Go packaging scripts)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "buildscripts.git" (X2Go packaging scripts).