From 868ea7821c2da3ec0c49cb31a95486cfff7eb061186dfc0df97fac6f39b893b3 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 7 Dec 2011 22:07:14 +0000 Subject: [PATCH] Fix inspect (used by quilt setup.) OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=39 --- fix-inspect.patch | 20 ++++++++++++++++++++ quilt.spec | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 fix-inspect.patch diff --git a/fix-inspect.patch b/fix-inspect.patch new file mode 100644 index 0000000..532a173 --- /dev/null +++ b/fix-inspect.patch @@ -0,0 +1,20 @@ +From: Jean Delvare +Subject: Fix quilt setup + +A previous bug fix uncovered an old bug, which has to be fixed now: +a file name of "-" means "read from stdin" for tar. +--- + quilt/scripts/inspect.in | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/quilt/scripts/inspect.in ++++ b/quilt/scripts/inspect.in +@@ -266,6 +266,8 @@ cat <<-'EOF' > $tmpdir/bin/wrapper + ;; + tar) + inputfile=$(tar_input_file "$@") ++ # For tar, file - means read from stdin ++ [ "$inputfile" = "-" ] && inputfile= + ;; + esac + if [ -z "$inputfile" ]; then diff --git a/quilt.spec b/quilt.spec index bbe2f62..5dda5eb 100644 --- a/quilt.spec +++ b/quilt.spec @@ -41,6 +41,7 @@ Patch3: patch-wrapper-rpm.diff Patch4: grep-support-spaces.patch Patch5: suse-workaround-pseudo-release.patch Patch6: mail-fix-delivery-address-checking.patch +Patch7: fix-inspect.patch Url: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,6 +67,7 @@ Authors: %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build autoconf