summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac6
-rw-r--r--quilt.changes5
2 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 9d4a62e..cc850fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -262,7 +262,11 @@ fi
AC_MSG_CHECKING([the version of $PATCH])
if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
set -- `$PATCH --version 2> /dev/null`
- patch_version=$2
+ if test x$1 = xGNU ; then
+ patch_version=$3
+ else
+ patch_version=$2
+ fi
AC_MSG_RESULT($patch_version)
saved_IFS=$IFS; IFS='.'
set -- $patch_version
diff --git a/quilt.changes b/quilt.changes
index e3287da..5e39a68 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Jun 23 13:23:08 CEST 2010 - jdelvare@suse.de
+
+- configure.ac: Properly detect newer versions of GNU patch.
+
+-------------------------------------------------------------------
Wed Jun 23 13:20:26 CEST 2010 - jdelvare@suse.de
- quilt/scripts/inspect.in: Handle reversed patches in spec files.