[X2Go-Commits] buildscripts.git - master (branch) updated: 5bd8e9ab9b66d82fef39bcf7f4d93950308692d2
X2Go dev team
git-admin at x2go.org
Fri Dec 6 13:53:02 CET 2013
The branch, master has been updated
via 5bd8e9ab9b66d82fef39bcf7f4d93950308692d2 (commit)
from 4e64b36196cd8e7388fe2ad45b6ae7c518102dc3 (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 5bd8e9ab9b66d82fef39bcf7f4d93950308692d2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Dec 6 13:52:22 2013 +0100
use quilt to apply patchsets in debian/patches
-----------------------------------------------------------------------
Summary of changes:
bin/build-rpm-package | 6 ++++++
1 file changed, 6 insertions(+)
The diff of changes is:
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 7d477c2..2ed16d6 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -181,6 +181,12 @@ build_packages() {
fi
sed -i $PROJECT.spec -e "s/%{?dist}/.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT%{?dist}/"
+ # apply patches from debian/patches/* so that they end up in the tarbal
+ # ... esp. relevant for NX (redistributed)
+ if [ -d $PROJECT/debian/patches/series ]; then
+ ( cd $PROJECT && QUILT_PATCHES=debian/patches quilt push -a && rm .pc/ -Rf; )
+ 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 .
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).
More information about the x2go-commits
mailing list