buildscripts.git - master (branch) updated: 0caea4a7d865166b1f2e55b996d8ced19387e319 - x2go-commits

29 Nov 2013

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

    tilde not allowed in RPM version strings, use some other way to make stable release supercede nightly builds

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

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

The diff of changes is:

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 2f856a6..02e7a32 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -173,8 +173,11 @@ build_packages() {
 	PKG_RELEASE=$(cat $PROJECT.spec | egrep "^Release:.*" | awk '{ print $2 }')
 	PKG_SRCRELEASE=$(echo $PKG_RELEASE | sed -e 's/%{?dist}//')
 
-	sed -i $PROJECT.spec -e "s/%{?dist}/~git$DATE.$GITREV.$COMPONENT%{?dist}/"
-
+	if [ "$COMPONENT" = "$COMPONENT_NIGHTLY" ]; then
+		sed -i $PROJECT.spec -e "s/%{?dist}/.0.git$DATE.$GITREV.$COMPONENT%{?dist}/"
+	else
+		sed -i $PROJECT.spec -e "s/%{?dist}/.1.git$DATE.$GITREV.$COMPONENT%{?dist}/"
+	fi
 	mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION
 	tar -czf $PKGDIST/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION
 


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

    