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

[X2Go dev team]

The branch, master has been updated
       via  f4a5a4df70c61729da30c7d5f0dfff69fe8e1068 (commit)
      from  82ba47688bc5364cc822c6b3b8a5addd0fc5b1e8 (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 f4a5a4df70c61729da30c7d5f0dfff69fe8e1068
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Dec 8 12:17:00 2013 +0100

    fix inclusion of Source: files

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

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

The diff of changes is:
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 93f6eb9..e607dfb 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -142,8 +142,7 @@ clear_pkgdist() {
 				for l_ARCH in x86_64 i386; do
 					if [ "x$SKIP_ARCH" != "x$l_ARCH" ]; then
 						mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
-						#rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/dupload.conf"
-						rm -f "$PKGDIST/rpmbuild/SOURCES/$PROJECT-"*.tar.gz
+						rm -f "$PKGDIST/rpmbuild/SOURCES/*
 						rm -f "$PKGDIST/rpmbuild/SRPMS/$PROJECT-"*.src.rpm
 						rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/"*.log
 						rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT-"*.rpm
@@ -189,8 +188,8 @@ build_packages() {
 	fi
 
 	cat $PROJECT.spec | egrep "^Source[1-9]+:.*" | awk '{ print $2 }' | while read source_file; do
-		find $PROJECT/rpm/$source_file -maxdepth 0 1> /dev/null && cp $PROJECT/rpm/$source_file . && continue
-		find $PROJECT/$source_file -maxdepth 0 1> /dev/null && cp $PROJECT/$source_file .
+		find $PROJECT/rpm/$source_file -maxdepth 0 1> /dev/null && cp $PROJECT/rpm/$source_file $PKGDIST/rpmbuild/SOURCES/ && continue
+		find $PROJECT/$source_file -maxdepth 0 1> /dev/null && cp $PROJECT/$source_file $PKGDIST/rpmbuild/SOURCES/
 	done
 
 	mv $TEMP_DIR/$PROJECT $TEMP_DIR/$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).