From 5e1bda92ccefe9ede71b1aa96a3ad293c5024eb37285d49ed8bd56e5235b7e0e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 25 May 2010 11:13:12 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/quilt revision 29.0 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=f39a68e9976e81c4772fd48fae82796a --- fix-patch-version-detection.patch | 13 +++++++++++++ quilt.changes | 5 +++++ quilt.spec | 5 +++-- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 fix-patch-version-detection.patch diff --git a/fix-patch-version-detection.patch b/fix-patch-version-detection.patch new file mode 100644 index 0000000..b6b445c --- /dev/null +++ b/fix-patch-version-detection.patch @@ -0,0 +1,13 @@ +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 + 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 + AC_MSG_RESULT($patch_version) + saved_IFS=$IFS; IFS='.' + set -- $patch_version diff --git a/quilt.changes b/quilt.changes index 5d2e33d..76ac7ca 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 19 10:01:44 UTC 2010 - puzel@novell.com + +- add fix-patch-version-detection.patch: fix build + ------------------------------------------------------------------- Tue Dec 8 00:34:00 CET 2009 - jengelh@medozas.de diff --git a/quilt.spec b/quilt.spec index b205b72..af802ab 100644 --- a/quilt.spec +++ b/quilt.spec @@ -24,7 +24,7 @@ Summary: A Tool for Working with Many Patches License: GPLv2+ Group: Productivity/Text/Utilities Version: 0.48 -Release: 5 +Release: 6 Requires: coreutils diffutils patch gzip bzip2 perl mktemp diffstat file %if %{suse_version} > 910 Recommends: procmail @@ -42,6 +42,7 @@ Patch7: revert-should-not-hard-link.diff Patch8: fix-fr-import-message.diff Patch9: lzma-xz-support.patch Patch10: inspect-lzma-xz.patch +Patch11: fix-patch-version-detection.patch Url: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -61,7 +62,7 @@ Authors: %prep %setup -q -%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -P 10 +%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -P 10 -P 11 %build autoconf