buildscripts.git - master (branch) updated: 6cf5e91bfd98ebee80b8bc31f459b549a5b96f32 - x2go-commits

29 Nov 2013

The branch, master has been updated
       via  6cf5e91bfd98ebee80b8bc31f459b549a5b96f32 (commit)
      from  6f2fd62cf4e9c0d62a01b6196f51872164c78855 (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 6cf5e91bfd98ebee80b8bc31f459b549a5b96f32
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Nov 29 16:49:37 2013 +0100

    build packages with special version scheme

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

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 751217e..82b8e0a 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -168,14 +168,15 @@ build_packages() {
 	cd "$PROJECT_DIR"
 	git clone --local "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/"
 	cd $TEMP_DIR
+	GITREV=$(cd $PROJECT && gitrevno && cd - 1>/dev/null)
 	rm -Rf "$PROJECT/.git"
-	cp $PROJECT/$PROJECT.spec .
+	mv $PROJECT/$PROJECT.spec .
 
 	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)
+	sed -i $PROJECT.spec -e "s/%{?dist}/~git$DATE.$GITREV.$COMPONENT%{?dist}/"
 
 	mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION
 	tar -czf ~/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION
@@ -226,10 +227,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 ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.src.rpm
+					mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE~git$DATE.$GITREV.$COMPONENT.src.rpm
 				}
 				[ "x$SKIP_ARCH" != "xi386" ] && {
-					mock -r ${l_DIST}-${l_CODENAME}-i386  --result $PKGDIST/$l_DIST/$l_CODENAME/i386 ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.src.rpm
+					mock -r ${l_DIST}-${l_CODENAME}-i386  --result $PKGDIST/$l_DIST/$l_CODENAME/i386 ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE~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).

    