From a11d3f7dd12244a2cdd48d5bb698b628846beea961d1c1279e1034e25cd6c64a Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 9 Oct 2014 13:02:55 +0000 Subject: [PATCH] - inspect-skip-version-check.patch: Skip version check when running "quilt setup" on a spec file. The previous fix only worked when running "quilt setup" on a series file. OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=88 --- inspect-skip-version-check.patch | 24 ++++++++++++++++++++++++ quilt.changes | 7 +++++++ quilt.spec | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 inspect-skip-version-check.patch diff --git a/inspect-skip-version-check.patch b/inspect-skip-version-check.patch new file mode 100644 index 0000000..a6106bc --- /dev/null +++ b/inspect-skip-version-check.patch @@ -0,0 +1,24 @@ +From: Jean Delvare +Subject: inspect: Skip version check +Upstream: Submitted (2014-10-09) + +Commit a626fcf8b95f2ff51701a00d65043b9f65207514 (setup: Skip version +check) is insufficient for spec file-based setup commands. inspect +itself also sources patchfns, so it must also skip the version check +explicitly. +--- + quilt/scripts/inspect.in | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/quilt/scripts/inspect.in ++++ b/quilt/scripts/inspect.in +@@ -8,6 +8,9 @@ + + : ${QUILT_DIR=@QUILT_DIR@} + ++# Version check is irrelevant to this script. ++skip_version_check=1 ++ + if ! [ -r $QUILT_DIR/scripts/patchfns ] + then + echo "Cannot read library $QUILT_DIR/scripts/patchfns" >&2 diff --git a/quilt.changes b/quilt.changes index c9d4ced..58dc7f4 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 9 15:00:35 CEST 2014 - jdelvare@suse.de + +- inspect-skip-version-check.patch: Skip version check when + running "quilt setup" on a spec file. The previous fix only + worked when running "quilt setup" on a series file. + ------------------------------------------------------------------- Wed Oct 1 14:10:22 CEST 2014 - jdelvare@suse.de diff --git a/quilt.spec b/quilt.spec index ff49ee8..ef617a0 100644 --- a/quilt.spec +++ b/quilt.spec @@ -49,6 +49,7 @@ Patch7: setup-fix-tar-with-long-options.patch Patch8: quilt-format-options-pass-through.patch Patch9: pop-add-auto-refresh.patch Patch10: push-add-auto-refresh.patch +Patch11: inspect-skip-version-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Recommends: procmail @@ -78,6 +79,7 @@ http://www.zip.com.au/~akpm/linux/patches/. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build # --with-rpmbuild=/usr/lib/rpm/rpmb: