summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-12-06 13:52:22 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-12-06 13:52:22 +0100
commit5bd8e9ab9b66d82fef39bcf7f4d93950308692d2 (patch)
tree8e6348ddaa4643a594521e8033c629128d72b7f0
parent4e64b36196cd8e7388fe2ad45b6ae7c518102dc3 (diff)
downloadbuildscripts-5bd8e9ab9b66d82fef39bcf7f4d93950308692d2.tar.gz
buildscripts-5bd8e9ab9b66d82fef39bcf7f4d93950308692d2.tar.bz2
buildscripts-5bd8e9ab9b66d82fef39bcf7f4d93950308692d2.zip
use quilt to apply patchsets in debian/patches
-rwxr-xr-xbin/build-rpm-package6
1 files changed, 6 insertions, 0 deletions
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 .