- quilt-makefile-fix-find-perm-usage.patch: Makefile: Fix "find

-perm" usage.
- quilt-makefile-fix-configure-with-xargs.patch: Makefile: Fix
  support for "./configure --with-xargs".
- quilt-find-quoting-style.patch: delete.test: Cope with new
  quoting style in find error message.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=68
This commit is contained in:
Jean Delvare 2013-09-30 12:38:29 +00:00 committed by Git OBS Bridge
parent 3676d6b3e0
commit 1589b21f92
5 changed files with 82 additions and 0 deletions

View File

@ -0,0 +1,20 @@
From: Jean Delvare <jdelvare@suse.de>
Date: Mon, 30 Sep 2013 12:21:16 +0000
Subject: delete.test: Cope with new quoting style in find error message
Git-commit: ab6c69664664ec66b097aeba113288f341f34e5d
---
test/delete.test | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/test/delete.test
+++ b/test/delete.test
@@ -77,7 +77,7 @@ Test the delete command.
$ quilt delete "test3"
> Removing patch %{P}test3
- >~ find: `?\./dir'?: Permission denied
+ >~ .*find: [`']?\./dir'?: Permission denied
$ chmod a+rx .pc/test3/dir

View File

@ -0,0 +1,19 @@
From: Jean Delvare <jdelvare@suse.de>
Date: Mon, 30 Sep 2013 12:22:45 +0000
Subject: Makefile.in: Fix support for configure --with-xargs
Git-commit: 4e09264d3cbbfc49761a36635f1662b9d38358eb
---
Makefile.in | 1 +
1 file changed, 1 insertion(+)
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,6 +30,7 @@ TR := @TR@
SED := @SED@
AWK := @AWK@
FIND := @FIND@
+XARGS := @XARGS@
DIFF := @DIFF@
PATCH := @PATCH@
MKTEMP := @MKTEMP@

View File

@ -0,0 +1,27 @@
From: Jean Delvare <jdelvare@suse.de>
Date: Fri, 24 May 2013 13:13:55 +0000
Subject: Makefile: Fix "find -perm" usage
Git-commit: bc340b709b866f50273d4ef125e1ae3cbc44c6ac
Support for obsolete find -perm +MODE syntax was removed from GNU
findutils by commit
v4.5.10-144-g90f0c5d24153ad3327edd6f2249fc95a5cfb72e0.
Reported by Dmitry V. Levin.
Also -maxdepth is not portable and not needed so drop it.
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/Makefile.in
+++ b/Makefile.in
@@ -277,7 +277,7 @@ Makefile : Makefile.in configure
@echo "Please run ./configure"
@false
-compat_leftover := $(filter-out $(COMPAT),$(shell $(FIND) compat -maxdepth 1 -type f -perm +111))
+compat_leftover := $(filter-out $(COMPAT),$(shell $(FIND) compat -type f -perm -0100))
.PHONY :: compat
compat :: $(COMPAT)

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Sep 30 14:36:03 CEST 2013 - jdelvare@suse.de
- quilt-makefile-fix-find-perm-usage.patch: Makefile: Fix "find
-perm" usage.
- quilt-makefile-fix-configure-with-xargs.patch: Makefile: Fix
support for "./configure --with-xargs".
- quilt-find-quoting-style.patch: delete.test: Cope with new
quoting style in find error message.
-------------------------------------------------------------------
Fri Apr 5 12:49:39 UTC 2013 - idonmez@suse.com

View File

@ -50,6 +50,9 @@ Patch9: quilt-setup-03-remember-alternative-names.patch
Patch10: quilt-setup-04-handle-zip-files.patch
Patch11: quilt-setup-05-fix-check_for_existing_files.patch
Patch12: quilt-setup-06-check-for-directories-too.patch
Patch13: quilt-makefile-fix-find-perm-usage.patch
Patch14: quilt-makefile-fix-configure-with-xargs.patch
Patch15: quilt-find-quoting-style.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Recommends: procmail
@ -78,6 +81,9 @@ http://www.zip.com.au/~akpm/linux/patches/.
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb: