From b1e658146ce40c8fec3dee99c7a7a341ff0e59e8e4abb6d4cd82ad3a4eaa3e1e Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.com>
Date: Fri, 16 Dec 2011 13:45:46 +0000
Subject: [PATCH] - Fix two rpmlint warnings.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=43
---
 patchfns-non-exec.patch | 14 ++++++++++++++
 quilt.changes           |  5 +++++
 quilt.spec              |  4 +++-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 patchfns-non-exec.patch

diff --git a/patchfns-non-exec.patch b/patchfns-non-exec.patch
new file mode 100644
index 0000000..79fde71
--- /dev/null
+++ b/patchfns-non-exec.patch
@@ -0,0 +1,14 @@
+Really skip setting execute bit on scripts/patchfns.
+Index: quilt/Makefile.in
+===================================================================
+--- quilt.orig/Makefile.in
++++ quilt/Makefile.in
+@@ -275,7 +275,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu
+ 		-e 's:@LOCALEDIR''@:$(localedir):g'			\
+ 		-e 's:@DOCSUBDIR''@:$(docdir):g'			\
+ 		$< > $@
+-	@$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@)
++	@$(if $(filter $@,$(NON_EXEC_IN)),,chmod +x $@)
+ 
+ lib/backup-files.o :: Makefile
+ 
diff --git a/quilt.changes b/quilt.changes
index 259b746..958e973 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Dec 16 14:41:39 CET 2011 - jdelvare@suse.de
+
+- Fix two rpmlint warnings.
+
 -------------------------------------------------------------------
 Fri Dec 16 11:53:53 CET 2011 - jdelvare@suse.de
 
diff --git a/quilt.spec b/quilt.spec
index 423d116..b74d17d 100644
--- a/quilt.spec
+++ b/quilt.spec
@@ -43,6 +43,7 @@ Patch5:         suse-workaround-pseudo-release.patch
 Patch6:         mail-fix-delivery-address-checking.patch
 Patch7:         fix-inspect.patch
 Patch8:         change-docdir-definition.patch
+Patch9:         patchfns-non-exec.patch
 Url:            http://savannah.nongnu.org/projects/quilt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -70,6 +71,7 @@ Authors:
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 # --with-rpmbuild=/usr/lib/rpm/rpmb:
@@ -87,7 +89,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
     --with-patch-wrapper \
     --with-patch=/usr/bin/patch \
     --with-rpmbuild=/usr/lib/rpm/rpmb
-make %{?jobs:-j%jobs} BUILD_ROOT=$RPM_BUILD_ROOT RELEASE=%release
+make %{?jobs:-j%jobs} RELEASE=%release
 # Compile quilt.el for faster emacs startup (bnc#617673)
 pushd lib
 emacs -batch -q --no-site -f batch-byte-compile quilt.el