buildscripts.git - master (branch) updated: 40754ccd94cd436b44343aeea25daa49b1c3809d - x2go-commits

8 Dec 2013

The branch, master has been updated
       via  40754ccd94cd436b44343aeea25daa49b1c3809d (commit)
      from  69fd96d860acd9320652b4d33a5ce73cdfb793d0 (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 40754ccd94cd436b44343aeea25daa49b1c3809d
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Sun Dec 8 15:43:30 2013 +0100

    fix for last commit

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

Summary of changes:
 bin/build-rpm-package |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

The diff of changes is:

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index d286833..03b31c5 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -155,12 +155,6 @@ clear_pkgdist() {
 }
 
 build_packages() {
-
-	# tar upstream sources from our Git clone
-	TEMP_DIR="$(mktemp -d --tmpdir=$TEMP_BASE)"
-	mkdir -p "$TEMP_DIR/$PROJECT"
-	chmod 2770 "$TEMP_DIR" -Rf
-
 	echo "$RPM_BUILD_FOR" | sed -e 's/ /\n/g' | while read line; do
 		l_DIST="$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])"
 		l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | sed -e 's/,/ /g' | tr [:upper:] [:lower:])}"
@@ -169,6 +163,14 @@ build_packages() {
 
 				test -z $CODENAMES || echo $line | grep $CODENAMES || break
 
+				# create rpmbuild subdirectories
+				mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SOURCES
+
+				# tar upstream sources from our Git clone
+				TEMP_DIR="$(mktemp -d --tmpdir=$TEMP_BASE)"
+				mkdir -p "$TEMP_DIR/$PROJECT"
+				chmod 2770 "$TEMP_DIR" -Rf
+
 				cd "$PROJECT_DIR"
 				git clone --local "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/"
 				cd $TEMP_DIR


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

    