Hello community, here is the log from the commit of package quilt for openSUSE:12.1:Update:Test checked in at 2012-01-25 15:06:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/quilt (Old) and /work/SRC/openSUSE:12.1:Update:Test/.quilt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quilt", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/quilt/quilt.changes 2012-01-25 15:06:39.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.quilt.new/quilt.changes 2012-01-25 15:06:39.000000000 +0100 @@ -0,0 +1,8 @@ +------------------------------------------------------------------ +Mon Jan 23 17:11:14 CET 2012 - [email protected] + +- suse-workaround-pseudo-release.patch: Filter invalid characters + in release field (bnc#628258). +- inspect-fix-xz-detection.patch: Fix detection of xz-compressed + archives and patches (bnc#739083). + New: ---- inspect-fix-xz-detection.patch suse-workaround-pseudo-release.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quilt.spec ++++++ --- /var/tmp/diff_new_pack.1jKsoW/_old 2012-01-25 15:06:39.000000000 +0100 +++ /var/tmp/diff_new_pack.1jKsoW/_new 2012-01-25 15:06:39.000000000 +0100 @@ -47,6 +47,8 @@ Patch13: setup-support-reverse-patch.patch Patch14: completion-revert.patch Patch15: inspect-shell-syntax-errors.patch +Patch16: inspect-fix-xz-detection.patch +Patch17: suse-workaround-pseudo-release.patch Url: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -67,6 +69,7 @@ %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 -P 11 -P 12 -P 13 -P 14 -P 15 +%patch -p1 -P 16 -P 17 %build autoconf ++++++ inspect-fix-xz-detection.patch ++++++ From: Philipp Thomas <[email protected]> Date: Thu, 10 Nov 2011 20:14:45 +0000 Subject: inspect: Newer file changed the output for xz compressed data so adapt to it. Patch-mainline: 0.50 Git-commit: 0b1f605c5d5db8b77a4e0d1c528c8d7bc696d471 - quilt/inspect.in: Newer file changed the output for xz compressed data so adapt to it. --- quilt/scripts/inspect.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- quilt-0.48.orig/quilt/scripts/inspect.in +++ quilt-0.48/quilt/scripts/inspect.in @@ -120,7 +120,7 @@ do 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) ++++++ suse-workaround-pseudo-release.patch ++++++ Upstream: Never Old Suse spec files have a pseudo release string which uses characters newer versions of rpmbuild don't like. Filter them out to make rpmbuild happy again. Packages in openSUSE 11.4 and later no longer need this. --- quilt-0.48.orig/quilt/scripts/inspect.in +++ quilt-0.48/quilt/scripts/inspect.in @@ -67,6 +67,14 @@ trap "rm -rf $tmpdir" EXIT mkdir -p $tmpdir/build mkdir -p $tmpdir/bin +# Older versions of Suse packages have a symbolic release number, and rpmbuild +# won't like that, so change it to something compliant. +if grep -q '^Release:.*[<>]' "$specdir/$specfile" +then + sed -e '/^Release:/s/[<>]//g' < "$specdir/$specfile" > $tmpdir/"$specfile" + specdir=$tmpdir +fi + # Redirect file descriptors if [ -n "$verbose" ] then -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
