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

[X2Go dev team]

The branch, master has been updated
       via  7774c9200054ed4d18d50cf4964b912cdb3aaafe (commit)
      from  bb6fb7106e9339981959adfa3c59b3d0ee328c55 (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 7774c9200054ed4d18d50cf4964b912cdb3aaafe
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 29 21:23:08 2013 +0100

    place rpmbuild dbpath into , fix build cruft clean up

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

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

The diff of changes is:
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 50b2a57..ab85fcc 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -92,7 +92,7 @@ prepare_workspace() {
 	rm -f "$PROJECT_DIR/RPM_BUILDS_FOR"
 
 	# create rpmbuild subdirectories
-	mkdir -p ~/rpmbuild/SOURCES
+	mkdir -p $PKGDIST/rpmbuild/SOURCES
 
 	# make sure our local working copy is up to date...
 
@@ -144,13 +144,10 @@ clear_pkgdist() {
 				for l_ARCH in x86_64 i386; do
 					[ "x$SKIP_ARCH" != "x$l_ARCH" ] && {
 						mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
-						rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/dupload.conf"
-						rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.changes
-						rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.upload
-						rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.build
-						rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.dsc
-						rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.tar.gz
-						rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/"*.deb
+						#rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/dupload.conf"
+						rm -f "$PKGDIST/rpmbuild/SOURCES/$PROJECT-"*.tar.gz
+						rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/"*.log
+						rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT-"*.rpm
 					}
 				done
 			done
@@ -165,6 +162,7 @@ build_packages() {
 	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
@@ -179,10 +177,10 @@ build_packages() {
 	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
+	tar -czf $PKGDIST/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION
 
 	# create the SRPM package
-	rpmbuild -bs $PROJECT.spec
+	rpmbuild --dbpath $PKGDIST/rpmbuild -bs $PROJECT.spec
 
 	# clean up the Git clone from the temp folder
 	cd && rm $TEMP_DIR/$PROJECT -Rf


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