From 52b217ab2505095c91777fca4b516c8cc0607d8cdf000816d4590a251e1ff5c0 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 21 Jun 2010 10:14:53 +0000 Subject: [PATCH] - 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 --- fix-patch-version-detection.patch | 21 +++++++++++++++------ quilt.changes | 6 ++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/fix-patch-version-detection.patch b/fix-patch-version-detection.patch index b6b445c..fa5a8d8 100644 --- a/fix-patch-version-detection.patch +++ b/fix-patch-version-detection.patch @@ -1,13 +1,22 @@ -Index: quilt-0.48/configure.ac -=================================================================== ---- 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 +New versions of GNU patch present themselves as "GNU patch" instead +of just "patch". + +--- + 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]) if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then set -- `$PATCH --version 2> /dev/null` - patch_version=$2 -+ patch_version=$3 ++ 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 7cb27ed..ea6e478 100644 --- a/quilt.changes +++ b/quilt.changes @@ -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