Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at 2012-03-07 13:45:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quilt (Old) and /work/SRC/openSUSE:Factory/.quilt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quilt", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2012-02-28 14:15:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2012-03-07 13:45:19.000000000 +0100 @@ -1,0 +2,21 @@ +Fri Mar 2 14:20:24 CET 2012 - [email protected] + +- Fix interaction between quilt and vimdiff (bnc#749563). + +------------------------------------------------------------------- +Thu Mar 1 21:29:26 CET 2012 - [email protected] + +- Fix build (/usr/lib/quilt is gone.) +- Turn into a noarch package. + +------------------------------------------------------------------- +Thu Mar 1 21:11:18 CET 2012 - [email protected] + +- update to 0.60 + o Includes a rewrite of backup-files from C to bash, making it + possible to turn quilt into a noarch package. + o Includes several fixes to the mail command. + o Obsoletes fix-relative-import.patch. + o Obsoletes grep-support-spaces.patch. + +------------------------------------------------------------------- Old: ---- fix-relative-import.patch grep-support-spaces.patch quilt-0.51.tar.bz2 New: ---- quilt-0.60.tar.bz2 quilt-support-vimdiff.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quilt.spec ++++++ --- /var/tmp/diff_new_pack.pAEpw1/_old 2012-03-07 13:45:21.000000000 +0100 +++ /var/tmp/diff_new_pack.pAEpw1/_new 2012-03-07 13:45:21.000000000 +0100 @@ -24,7 +24,7 @@ Summary: A Tool for Working with Many Patches License: GPL-2.0+ Group: Productivity/Text/Utilities -Version: 0.51 +Version: 0.60 Release: 0 Requires: bzip2 Requires: coreutils @@ -46,13 +46,13 @@ Source: %{name}-%{version}.tar.bz2 Source1: suse-start-quilt-mode.el Patch1: expand.diff -Patch2: fix-relative-import.patch +patch2: quilt-support-vimdiff.patch Patch3: patch-wrapper-rpm.diff -Patch4: grep-support-spaces.patch Patch5: suse-workaround-pseudo-release.patch Patch6: quilt-stable-rebuild.patch Url: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Quilt allows you to easily manage large numbers of patches by keeping @@ -73,7 +73,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 @@ -132,7 +131,6 @@ /usr/bin/quilt /usr/share/quilt/ /usr/share/emacs/ -/usr/lib/quilt/ %config /etc/quilt.quiltrc %config /etc/bash_completion.d/quilt.sh %doc %{_mandir}/man1/guards.1.gz ++++++ quilt-0.51.tar.bz2 -> quilt-0.60.tar.bz2 ++++++ ++++ 6870 lines of diff (skipped) ++++++ quilt-stable-rebuild.patch ++++++ --- /var/tmp/diff_new_pack.pAEpw1/_old 2012-03-07 13:45:21.000000000 +0100 +++ /var/tmp/diff_new_pack.pAEpw1/_new 2012-03-07 13:45:21.000000000 +0100 @@ -1,8 +1,10 @@ -Index: quilt-0.51/Makefile.in -=================================================================== ---- quilt-0.51.orig/Makefile.in -+++ quilt-0.51/Makefile.in -@@ -227,8 +227,11 @@ doc/reference : bin/quilt $(QUILT:%=quil +--- + Makefile.in | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- quilt-0.60.orig/Makefile.in ++++ quilt-0.60/Makefile.in +@@ -215,8 +215,11 @@ doc/reference : bin/quilt $(QUILT:%=quil @unset LANG LC_MESSAGES LC_CTYPE LC_ALL; \ for i in $(QUILT); \ do \ @@ -10,8 +12,8 @@ + done | sort | while read j ; \ + do \ echo; \ -- quilt $$i -h; \ -+ quilt $$j -h; \ +- QUILT_PC=.fake_pc quilt $$i -h; \ ++ QUILT_PC=.fake_pc quilt $$j -h; \ echo; \ done | \ $(SED) -e 's/\$$EDITOR ([^)]*)/$$EDITOR/' \ ++++++ quilt-support-vimdiff.patch ++++++ From: Jean Delvare <[email protected]> Subject: Fix interaction between quilt and vimdiff References: bnc#749563 Using vimdiff as a diff viewer in quilt breaks if QUILT_PAGER is set. So inhibit the pager in that case. Other diff viewers may be affected as well but I don't know how to fix this in a generic way, short of inhibiting the pager as soon as option --diff is passed to the diff command. Not sure if this desirable though, as I presume non-interactive alternative diff viewers must exist too. --- quilt/diff.in | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) --- a/quilt/diff.in +++ b/quilt/diff.in @@ -66,7 +66,9 @@ included. --diff=utility Use the specified utility for generating the diff. The utility - is invoked with the original and new file name as arguments. + is invoked with the original and new file name as arguments. If + using an interactive text-mode diff viewer that is not known to + quilt, you will have to unset QUILT_PAGER for proper result. --color[=always|auto|never] Use syntax coloring. @@ -211,6 +213,13 @@ done QUILT_DIFF_OPTS="$QUILT_DIFF_OPTS $opt_format" +# Inhibit pager for interactive text-mode diff viewers +case "$(basename $opt_diff)" in +vimdiff) + QUILT_PAGER= + ;; +esac + opt_files=( $(for file in "$@"; do echo "$SUBDIR$file" ; done) ) if [ $[0$opt_combine + 0$opt_snapshot + 0$opt_relative] -gt 1 ] -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
