- Fix two rpmlint warnings.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=43
This commit is contained in:
Jean Delvare 2011-12-16 13:45:46 +00:00 committed by Git OBS Bridge
parent 0ce1655a64
commit 8dc3b4250d
3 changed files with 22 additions and 1 deletions

14
patchfns-non-exec.patch Normal file
View File

@ -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

View File

@ -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 Fri Dec 16 11:53:53 CET 2011 - jdelvare@suse.de

View File

@ -43,6 +43,7 @@ Patch5: suse-workaround-pseudo-release.patch
Patch6: mail-fix-delivery-address-checking.patch Patch6: mail-fix-delivery-address-checking.patch
Patch7: fix-inspect.patch Patch7: fix-inspect.patch
Patch8: change-docdir-definition.patch Patch8: change-docdir-definition.patch
Patch9: patchfns-non-exec.patch
Url: http://savannah.nongnu.org/projects/quilt Url: http://savannah.nongnu.org/projects/quilt
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -70,6 +71,7 @@ Authors:
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1
%build %build
# --with-rpmbuild=/usr/lib/rpm/rpmb: # --with-rpmbuild=/usr/lib/rpm/rpmb:
@ -87,7 +89,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
--with-patch-wrapper \ --with-patch-wrapper \
--with-patch=/usr/bin/patch \ --with-patch=/usr/bin/patch \
--with-rpmbuild=/usr/lib/rpm/rpmb --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) # Compile quilt.el for faster emacs startup (bnc#617673)
pushd lib pushd lib
emacs -batch -q --no-site -f batch-byte-compile quilt.el emacs -batch -q --no-site -f batch-byte-compile quilt.el