From 5bd8e9ab9b66d82fef39bcf7f4d93950308692d2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 6 Dec 2013 13:52:22 +0100 Subject: use quilt to apply patchsets in debian/patches --- bin/build-rpm-package | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'bin') 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 . -- cgit v1.2.3