Accepting request 90926 from home:psmt:branches:devel:tools:scm

Make quilt work again with xz compressed files

OBS-URL: https://build.opensuse.org/request/show/90926
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=33
This commit is contained in:
Philipp Thomas 2011-11-10 12:17:37 +00:00 committed by Git OBS Bridge
parent da14be5723
commit 529f0b3a6f
3 changed files with 14 additions and 6 deletions

View File

@ -8,8 +8,10 @@ Based on preliminary work by Philipp Thomas.
quilt/scripts/inspect.in | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
--- quilt-0.48.orig/quilt/scripts/inspect.in
+++ quilt-0.48/quilt/scripts/inspect.in
Index: quilt/scripts/inspect.in
===================================================================
--- quilt-0.48/quilt/scripts/inspect.in.orig 2009-01-31 03:28:06.000000000 +0100
+++ quilt-0.48/quilt/scripts/inspect.in 2011-11-10 12:22:14.622721864 +0100
@@ -87,7 +87,17 @@ do
echo "md5sum < $file" >&2
set -- $(md5sum < "$file")
@ -39,7 +41,7 @@ Based on preliminary work by Philipp Thomas.
+ set -- $(lzma -cd "$file" | md5sum)
+ echo "$1 $basename"
+ ;;
+ xz*)
+ xz*|XZ*)
+ echo -n "x" >&4
+ echo "xz -cd $file | md5sum" >&2
+ set -- $(xz -cd "$file" | md5sum)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 10 12:25:27 CET 2011 - pth@suse.de
- Newer file changed the output for xz compressed data so
adapt to it.
-------------------------------------------------------------------
Thu Oct 6 18:53:45 CEST 2011 - ohering@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package quilt (Version 0.48)
# spec file for package quilt
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -46,7 +46,7 @@ Patch11: fix-patch-version-detection.patch
Patch12: setup-add-fuzz-parameter.patch
Patch13: setup-support-reverse-patch.patch
Patch14: completion-revert.patch
Patch15: inspect-shell-syntax-errors.patch
Patch15: inspect-shell-syntax-errors.patch
Url: http://savannah.nongnu.org/projects/quilt
BuildRoot: %{_tmppath}/%{name}-%{version}-build