Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at 2011-12-21 14:58:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2011-11-10 16:04:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2011-12-21 14:58:37.000000000 +0100 @@ -1,0 +2,46 @@ +Wed Dec 7 23:26:56 CET 2011 - [email protected] + +- fix-inspect.patch: Fix inspect (quilt setup). + +------------------------------------------------------------------- +Wed Dec 7 20:53:56 CET 2011 - [email protected] + +- mail-fix-delivery-address-checking.patch: quilt mail: Fix + delivery address checking. + +------------------------------------------------------------------- +Tue Dec 6 14:24:24 CET 2011 - [email protected] + +- update to 0.50 + o Obsoletes fix-test-create-delete.diff. + o Obsoletes hide-git-desc-error.diff. + o Obsoletes mail-dont-use-equal-tilde.diff. + o Obsoletes revert-should-not-hard-link.diff. + o Obsoletes fix-fr-import-message.diff. + o Obsoletes lzma-xz-support.patch, except expand part which was + merged in expand.diff. + o Obsoletes inspect-lzma-xz.patch. + o Obsoletes fix-patch-version-detection.patch. + o Obsoletes setup-add-fuzz-parameter.patch. + o Obsoletes setup-support-reverse-patch.patch. + o Obsoletes completion-revert.patch. + o Obsoletes inspect-shell-syntax-errors.patch. + o Obsoletes mail-fix-a-temporary-directory-leak.patch. + o Too many upstream changes in 34 months to list. +- Add missing requires: findutils. +- Add recommends: xz. + +------------------------------------------------------------------- +Thu Dec 1 16:23:20 CET 2011 - [email protected] + +- suse-workaround-pseudo-release.patch: Filter invalid characters + in release field (bnc#628258). + +------------------------------------------------------------------- +Thu Nov 10 21:00:07 CET 2011 - [email protected] + +- grep-support-spaces.patch: grep: Accept file names with spaces. +- mail-fix-a-temporary-directory-leak.patch: mail: Fix a temporary + directory leak. + +------------------------------------------------------------------- Old: ---- completion-revert.patch fix-fr-import-message.diff fix-patch-version-detection.patch fix-test-create-delete.diff hide-git-desc-error.diff inspect-lzma-xz.patch inspect-shell-syntax-errors.patch lzma-xz-support.patch mail-dont-use-equal-tilde.diff quilt-0.48.tar.bz2 revert-should-not-hard-link.diff setup-add-fuzz-parameter.patch setup-support-reverse-patch.patch New: ---- fix-inspect.patch grep-support-spaces.patch mail-fix-delivery-address-checking.patch quilt-0.50.tar.bz2 suse-workaround-pseudo-release.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quilt.spec ++++++ --- /var/tmp/diff_new_pack.tMbC1p/_old 2011-12-21 14:58:38.000000000 +0100 +++ /var/tmp/diff_new_pack.tMbC1p/_new 2011-12-21 14:58:38.000000000 +0100 @@ -23,30 +23,25 @@ Summary: A Tool for Working with Many Patches License: GPLv2+ Group: Productivity/Text/Utilities -Version: 0.48 -Release: 13 -Requires: coreutils diffutils patch gzip bzip2 perl mktemp diffstat file +Version: 0.50 +Release: 1 +Requires: coreutils diffutils findutils patch gzip bzip2 perl mktemp diffstat file %if %{suse_version} > 910 Recommends: procmail %endif +%if %{suse_version} > 1120 +Recommends: xz +%endif AutoReqProv: off Source: %{name}-%{version}.tar.bz2 Source1: suse-start-quilt-mode.el Patch1: expand.diff Patch2: docdir.diff Patch3: patch-wrapper-rpm.diff -Patch4: fix-test-create-delete.diff -Patch5: hide-git-desc-error.diff -Patch6: mail-dont-use-equal-tilde.diff -Patch7: revert-should-not-hard-link.diff -Patch8: fix-fr-import-message.diff -Patch9: lzma-xz-support.patch -Patch10: inspect-lzma-xz.patch -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 +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,7 +61,13 @@ %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 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build autoconf ++++++ docdir.diff ++++++ --- /var/tmp/diff_new_pack.tMbC1p/_old 2011-12-21 14:58:38.000000000 +0100 +++ /var/tmp/diff_new_pack.tMbC1p/_new 2011-12-21 14:58:38.000000000 +0100 @@ -3,18 +3,18 @@ doc/quilt.1.in | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) ---- quilt-0.48.orig/Makefile.in -+++ quilt-0.48/Makefile.in -@@ -266,7 +266,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu - -e 's:@VERSION''@:$(VERSION):g' \ +--- quilt-0.50.orig/Makefile.in ++++ quilt-0.50/Makefile.in +@@ -268,7 +268,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu -e 's:@RELEASE''@:$(RELEASE):g' \ + -e 's:@ETCDIR''@:$(etcdir):g' \ -e 's:@LOCALEDIR''@:$(localedir):g' \ - -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \ + -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE):g' \ $< > $@ @$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@) -@@ -325,11 +325,11 @@ endif +@@ -327,11 +327,11 @@ endif $(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE) $(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/ @@ -29,7 +29,7 @@ $(INSTALL) -d $(BUILD_ROOT)$(mandir)/man1 $(INSTALL) -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/ -@@ -367,7 +367,7 @@ uninstall :: +@@ -369,7 +369,7 @@ uninstall :: $(notdir $(MAN1))) \ $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt \ $(BUILD_ROOT)$(etcdir)/quilt.quiltrc \ @@ -38,9 +38,9 @@ $(BUILD_ROOT)$(emacsdir)/quilt.el check: $(TESTS:test/%.test=test/.%.ok) ---- quilt-0.48.orig/doc/quilt.1.in -+++ quilt-0.48/doc/quilt.1.in -@@ -217,7 +217,7 @@ the pdf documentation, and in the help m +--- quilt-0.50.orig/doc/quilt.1.in ++++ quilt-0.50/doc/quilt.1.in +@@ -224,7 +224,7 @@ the pdf documentation, and in the help m .SH SEE ALSO ++++++ expand.diff ++++++ --- /var/tmp/diff_new_pack.tMbC1p/_old 2011-12-21 14:58:38.000000000 +0100 +++ /var/tmp/diff_new_pack.tMbC1p/_new 2011-12-21 14:58:38.000000000 +0100 @@ -1,7 +1,7 @@ -Index: quilt-0.46/quilt/expand.in +Index: quilt-0.50/quilt/expand.in =================================================================== --- /dev/null -+++ quilt-0.46/quilt/expand.in ++++ quilt-0.50/quilt/expand.in @@ -0,0 +1,236 @@ +#! @BASH@ + @@ -139,7 +139,7 @@ +fi + +combined_series=$(patch_file_name $combined_patch \ -+ | sed -e 's:\.gz$::' -e 's:\.bz2$::').series ++ | sed -e 's:\.gz$::' -e 's:\.bz2$::' -e 's:\.xz$::' -e 's:\.lzma$::').series + +if ! [ -f "$combined_series" ] +then @@ -239,10 +239,10 @@ +### mode: shell-script +### End: +# vim:filetype=sh -Index: quilt-0.46/test/expand.test +Index: quilt-0.50/test/expand.test =================================================================== --- /dev/null -+++ quilt-0.46/test/expand.test ++++ quilt-0.50/test/expand.test @@ -0,0 +1,121 @@ + $ rm -rf d + $ mkdir -p d/patches ++++++ fix-inspect.patch ++++++ From: Jean Delvare <[email protected]> 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 ++++++ grep-support-spaces.patch ++++++ Subject: grep: Accept file names with spaces This is a continuation of Yasushi SHOJI's initial work of fixing support for file names with spaces. This time I fixed support in the grep command. This is particularly important because the grep command operates on all files in the work tree, even if they aren't touched by any patch, so the chances that one of them has a space in its name is greater. As before, no guarantee is made that all options are covered, but this should be a good starting point. Signed-off-by: Jean Delvare <[email protected]> --- quilt/grep.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- quilt-0.50.orig/quilt/grep.in +++ quilt-0.50/quilt/grep.in @@ -117,8 +117,8 @@ fi find "${myargs[@]:-.}" \( \ -path "./$QUILT_PATCHES/*" -o \ -path "./$QUILT_PC/*" \) -prune -o \ - -type f -print \ -| xargs grep $opt_H "${args[@]}" \ + -type f -print0 \ +| xargs -0 grep $opt_H "${args[@]}" \ | if [ ${#myargs[@]} -eq 0 ]; then sed -e 's,^./,,' else ++++++ mail-fix-delivery-address-checking.patch ++++++ >From 00e551287a23749c7d1b0bc3e25741a5bd360bcd Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher <[email protected]> Date: Wed, 07 Dec 2011 17:52:39 +0000 Subject: quilt mail: Fix delivery address checking Make sure to remove trailing whitespace (including the newline) when extracting recipient addresses from headers. --- diff --git a/quilt/scripts/edmail.in b/quilt/scripts/edmail.in index 10aa771..140355b 100644 --- a/quilt/scripts/edmail.in +++ b/quilt/scripts/edmail.in @@ -128,11 +128,12 @@ sub split_recipients($) { while ($recipients !~ /^\s*$/) { my $recipient; if ($recipients =~ s/^\s*,?\s*((?:"(?:[^"]+)"|[^",])*)//) { - $recipient = $1; s/\s*$//; + $recipient = $1; } else { $recipient = $recipients; $recipients = ""; } + $recipient =~ s/\s*$//; push @list, $recipient; } return @list; @@ -144,7 +145,7 @@ sub process_header($) { my ($name, $value); return unless defined $_; - unless (($name, $value) = /^([\41-\176]+):\s*(.*)\s*/s) { + unless (($name, $value) = /^([\41-\176]+):\s*(.*)/s) { print; return } -- cgit v0.8.3.4 ++++++ quilt-0.48.tar.bz2 -> quilt-0.50.tar.bz2 ++++++ ++++ 16271 lines of diff (skipped) ++++++ 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]
