- fix-patch-version-detection.patch: Update so that we don't break

the build on all older distributions.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=23
This commit is contained in:
Jean Delvare 2010-06-21 10:14:53 +00:00 committed by Git OBS Bridge
parent 58385cd065
commit 52b217ab25
2 changed files with 21 additions and 6 deletions

View File

@ -1,13 +1,22 @@
Index: quilt-0.48/configure.ac New versions of GNU patch present themselves as "GNU patch" instead
=================================================================== of just "patch".
--- quilt-0.48.orig/configure.ac 2009-01-31 03:28:06.000000000 +0100
+++ quilt-0.48/configure.ac 2010-05-19 11:59:38.000000000 +0200 ---
@@ -274,7 +274,7 @@ fi configure.ac | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- quilt-0.48.orig/configure.ac
+++ quilt-0.48/configure.ac
@@ -274,7 +274,11 @@ fi
AC_MSG_CHECKING([the version of $PATCH]) AC_MSG_CHECKING([the version of $PATCH])
if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
set -- `$PATCH --version 2> /dev/null` set -- `$PATCH --version 2> /dev/null`
- patch_version=$2 - patch_version=$2
+ if test x$1 = xGNU ; then
+ patch_version=$3 + patch_version=$3
+ else
+ patch_version=$2
+ fi
AC_MSG_RESULT($patch_version) AC_MSG_RESULT($patch_version)
saved_IFS=$IFS; IFS='.' saved_IFS=$IFS; IFS='.'
set -- $patch_version set -- $patch_version

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jun 21 12:12:58 CEST 2010 - jdelvare@suse.de
- fix-patch-version-detection.patch: Update so that we don't break
the build on all older distributions.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jun 20 22:22:41 CEST 2010 - jdelvare@suse.de Sun Jun 20 22:22:41 CEST 2010 - jdelvare@suse.de