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

[X2Go dev team]

The branch, master has been updated
       via  21eb682c31d5acba54b95f7cdab0f7592f05c632 (commit)
      from  0caea4a7d865166b1f2e55b996d8ced19387e319 (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 21eb682c31d5acba54b95f7cdab0f7592f05c632
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Nov 30 00:17:33 2013 +0100

    introduce variable

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

Summary of changes:
 bin/build-rpm-package |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 02e7a32..04cbc35 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -174,10 +174,11 @@ build_packages() {
 	PKG_SRCRELEASE=$(echo $PKG_RELEASE | sed -e 's/%{?dist}//')
 
 	if [ "$COMPONENT" = "$COMPONENT_NIGHTLY" ]; then
-		sed -i $PROJECT.spec -e "s/%{?dist}/.0.git$DATE.$GITREV.$COMPONENT%{?dist}/"
+		IS_RELEASE="0"
 	else
-		sed -i $PROJECT.spec -e "s/%{?dist}/.1.git$DATE.$GITREV.$COMPONENT%{?dist}/"
+		IS_RELEASE="1"
 	fi
+	sed -i $PROJECT.spec -e "s/%{?dist}/.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT%{?dist}/"
 	mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION
 	tar -czf $PKGDIST/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION
 
@@ -227,10 +228,10 @@ build_packages() {
 				#fi
 
 				[ "x$SKIP_ARCH" != "xx86_64" ] && {
-					mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE~git$DATE.$GITREV.$COMPONENT.src.rpm
+					mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm
 				}
 				[ "x$SKIP_ARCH" != "xi386" ] && {
-					mock -r ${l_DIST}-${l_CODENAME}-i386  --result $PKGDIST/$l_DIST/$l_CODENAME/i386 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE~git$DATE.$GITREV.$COMPONENT.src.rpm
+					mock -r ${l_DIST}-${l_CODENAME}-i386  --result $PKGDIST/$l_DIST/$l_CODENAME/i386 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm
 				}
 			done
 		}


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).