Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at 2012-02-03 10:26:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-25 11:09:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2012-02-03 10:26:15.000000000 +0100 @@ -1,0 +2,23 @@ +Wed Feb 1 16:01:36 CET 2012 - [email protected] + +- Fix license string to make rpmlint happy. + +------------------------------------------------------------------- +Mon Jan 30 13:49:59 CET 2012 - [email protected] + +- fix-relative-import.patch: Fix import of relative patches + (savannah#35244). + +------------------------------------------------------------------- +Sun Jan 29 20:22:18 CET 2012 - [email protected] + +- update to 0.51 + o Obsoletes change-docdir-definition.patch. + o Obsoletes fix-inspect.patch. + o Obsoletes inspect-check-if-wrapper-executable.patch. + o Obsoletes inspect-remap-outputs.patch. + o Obsoletes mail-fix-delivery-address-checking.patch. + o Obsoletes patchfns-non-exec.patch. + o Obsoletes substitute-docdir-in-man-page.patch. + +------------------------------------------------------------------- Old: ---- change-docdir-definition.patch fix-inspect.patch inspect-check-if-wrapper-executable.patch inspect-remap-outputs.patch mail-fix-delivery-address-checking.patch patchfns-non-exec.patch quilt-0.50.tar.bz2 substitute-docdir-in-man-page.patch New: ---- fix-relative-import.patch quilt-0.51.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quilt.spec ++++++ --- /var/tmp/diff_new_pack.6DuZrx/_old 2012-02-03 10:26:18.000000000 +0100 +++ /var/tmp/diff_new_pack.6DuZrx/_new 2012-02-03 10:26:18.000000000 +0100 @@ -21,9 +21,9 @@ Name: quilt BuildRequires: diffstat ed emacs-nox procmail Summary: A Tool for Working with Many Patches -License: GPLv2+ +License: GPL-2.0+ Group: Productivity/Text/Utilities -Version: 0.50 +Version: 0.51 Release: 1 Requires: coreutils diffutils findutils patch gzip bzip2 perl mktemp diffstat file %if %{suse_version} > 910 @@ -36,16 +36,10 @@ Source: %{name}-%{version}.tar.bz2 Source1: suse-start-quilt-mode.el Patch1: expand.diff -Patch2: substitute-docdir-in-man-page.patch +Patch2: fix-relative-import.patch 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 -Patch8: change-docdir-definition.patch -Patch9: patchfns-non-exec.patch -Patch10: inspect-remap-outputs.patch -Patch11: inspect-check-if-wrapper-executable.patch Url: http://savannah.nongnu.org/projects/quilt BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,12 +64,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 %build # --with-rpmbuild=/usr/lib/rpm/rpmb: ++++++ fix-relative-import.patch ++++++ Fix import of relative patches. This closes bug #35244. --- quilt/import.in | 8 ++++---- quilt/scripts/patchfns.in | 17 ++++++++++++++--- test/import.test | 9 +++++++++ 3 files changed, 27 insertions(+), 7 deletions(-) --- a/test/import.test +++ b/test/import.test @@ -246,3 +246,12 @@ $ cat patches/series > patch1.diff > patchR.diff + +# Also test importing when in a subdirectory + $ touch empty.patch + $ cd t + $ touch empty2.patch + $ quilt import ../empty.patch + > Importing patch ../empty.patch (stored as ../patches/empty.patch) + $ quilt import %{PWD}/empty2.patch + > Importing patch %{PWD}/empty2.patch (stored as ../patches/empty2.patch) --- a/quilt/import.in +++ b/quilt/import.in @@ -152,16 +152,16 @@ then fi before=$(patch_after "$(top_patch)") -for patch_file in "$@" +for orig_patch_file in "$@" do if [ -n "$opt_patch" ] then patch=$opt_patch else - patch=${patch_file##*/} + patch=${orig_patch_file##*/} fi - patch_file=$(find_patch_file "$patch_file") || exit 1 + patch_file=$(find_patch_file "$orig_patch_file") || exit 1 merged_patch_file="$patch_file" if is_applied $patch @@ -199,7 +199,7 @@ do printf $"Importing patch %s\n" "$(print_patch $patch)" else printf $"Importing patch %s (stored as %s)\n" \ - "$patch_file" \ + "$orig_patch_file" \ "$(print_patch $patch)" mkdir -p "${dest%/*}" --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -641,10 +641,21 @@ find_patch_file() { local name="$1" - if [ -r "$name" ] + if [ ${name:0:1} = / ] then - echo "$name" - return + # Patch has absolute path + if [ -r "$name" ] + then + echo "$name" + return + fi + else + # Patch has a relative path + if [ -r "$SUBDIR$name" ] + then + echo "$SUBDIR$name" + return + fi fi local patch ++++++ quilt-0.50.tar.bz2 -> quilt-0.51.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/Makefile.in new/quilt-0.51/Makefile.in --- old/quilt-0.50/Makefile.in 2011-11-14 14:42:43.000000000 +0100 +++ new/quilt-0.51/Makefile.in 2012-01-28 15:46:14.000000000 +0100 @@ -1,6 +1,7 @@ PACKAGE := @PACKAGE_NAME@ VERSION := @PACKAGE_VERSION@ RELEASE := @PACKAGE_RELEASE@ +PACKAGE_TARNAME := @PACKAGE_TARNAME@ PACKAGE_BUGREPORT := @PACKAGE_BUGREPORT@ prefix := @prefix@ @@ -23,6 +24,7 @@ DATE := @DATE@ PERL := @PERL@ BASH := @BASH@ +SHELL:= @BASH@ # It does not work if dash is used as a shell, for example GREP := @GREP@ TAIL := @TAIL@ TR := @TR@ @@ -82,7 +84,7 @@ SRC += $(QUILT_SRC:%=quilt/%) DIRT += $(QUILT_IN:%=quilt/%) -SCRIPTS_IN := patchfns parse-patch inspect dependency-graph edmail \ +SCRIPTS_IN := patchfns inspect dependency-graph edmail \ remove-trailing-ws SCRIPTS_SRC := $(SCRIPTS_IN:%=%.in) @@ -99,19 +101,19 @@ SRC += $(LIB_SRC:%=lib/%) DIRT += lib/backup-files$(EXEEXT) $(LIB_SRC:%.c=lib/%.o) -DOC_IN := README +DOC_IN := README quilt.1 DOC_SRC := $(DOC_IN:%=doc/%.in) DOC := $(DOC_IN) SRC += $(DOC_SRC) -SRC += doc/main.tex doc/quilt.pdf doc/Makefile doc/quilt.1.in \ +SRC += doc/main.tex doc/quilt.pdf doc/Makefile \ doc/README.MAIL doc/README.EMACS -DIRT += $(DOC_IN:%=doc/%) doc/quilt.1 +DIRT += $(DOC_IN:%=doc/%) doc/reference MAN1 := doc/quilt.1 ifneq ($(POD2MAN),) MAN1 += bin/guards.1 +DIRT += bin/guards.1 endif -DIRT += $(MAN1) LINGUAS := fr de ja ru PO := quilt.pot $(LINGUAS:%=%.po) @@ -188,12 +190,12 @@ |$(MSGUNIQ) \ |$(MSGCAT) --force-po -F - $@ -o $@ -doc/README : doc/README.in $(QUILT:%=quilt/%) $(COMPAT) +doc/README : doc/README.in doc/reference @echo "README.in -> README" @while read line; do \ case "$$line" in \ '@REFERENCE''@') \ - $(MAKE) -s reference \ + cat doc/reference \ ;; \ *) \ echo $$line \ @@ -201,15 +203,19 @@ esac ; \ done 2>&1 < $< > $@ -doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) $(COMPAT) +doc/quilt.1: doc/quilt.1.in doc/reference $(COMPAT) @echo "quilt.1.in -> quilt.1" - while read line; do \ + @while read line; do \ case "$$line" in \ '@REFERENCE''@') \ - $(MAKE) -s reference | \ $(SED) -e 's/^quilt \([^ ]*\)\(.*\)/.IP "\\fB\1\\fP\2 " 4/' \ -e $$'s/^ \\(-[^\t]*\\)\t\\?/.IP " \\1" 8\\\n/' \ -e $$'s/^ \t\\?//' \ + < doc/reference \ + ;; \ + *@DOCSUBDIR@*) \ + echo "$$line" | \ + $(SED) -e 's:@DOCSUBDIR''@:$(docdir):g' \ ;; \ *) \ echo "$$line" \ @@ -217,8 +223,7 @@ esac; \ done < $< 2>&1 > $@ -.PHONY :: reference -reference : $(QUILT:%=quilt/%) quilt/scripts/patchfns compat +doc/reference : bin/quilt $(QUILT:%=quilt/%) quilt/scripts/patchfns $(COMPAT) @unset LANG LC_MESSAGES LC_CTYPE LC_ALL; \ for i in $(QUILT); \ do \ @@ -228,7 +233,7 @@ done | \ $(SED) -e 's/\$$EDITOR ([^)]*)/$$EDITOR/' \ -e '/^$$/!s/^/ /' \ - -e 's/^ Usage: *//' + -e 's/^ Usage: *//' > $@ bin/guards.1 : bin/guards $(POD2MAN) $< > $@ @@ -268,9 +273,9 @@ -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):g' \ $< > $@ - @$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@) + @$(if $(filter $@,$(NON_EXEC_IN)),,chmod +x $@) lib/backup-files.o :: Makefile @@ -327,11 +332,11 @@ $(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE) $(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/ - $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ + $(INSTALL) -d $(BUILD_ROOT)$(docdir)/ $(INSTALL) -m 644 doc/README \ - $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ + $(BUILD_ROOT)$(docdir)/ $(INSTALL) -m 644 doc/quilt.pdf doc/README.MAIL \ - $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ + $(BUILD_ROOT)$(docdir)/ $(INSTALL) -d $(BUILD_ROOT)$(mandir)/man1 $(INSTALL) -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/ @@ -369,7 +374,7 @@ $(notdir $(MAN1))) \ $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt \ $(BUILD_ROOT)$(etcdir)/quilt.quiltrc \ - $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ \ + $(BUILD_ROOT)$(docdir)/ \ $(BUILD_ROOT)$(emacsdir)/quilt.el check: $(TESTS:test/%.test=test/.%.ok) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/bash_completion new/quilt-0.51/bash_completion --- old/quilt-0.50/bash_completion 2010-11-02 18:50:34.000000000 +0100 +++ new/quilt-0.51/bash_completion 2012-01-23 13:52:57.000000000 +0100 @@ -239,7 +239,7 @@ COMPREPLY=( $( compgen -W "-a -f -R -q -v -h $(quilt applied 2>/dev/null)" -- $cur ) ) ;; push) - COMPREPLY=( $( compgen -W "-a -f -q -v -h --leave-rejects --interactive --color $(quilt unapplied)" -- $cur ) ) + COMPREPLY=( $( compgen -W "-a -f -q -v -h --leave-rejects --interactive --color $(quilt unapplied 2>/dev/null)" -- $cur ) ) ;; refresh) case $prev in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/configure new/quilt-0.51/configure --- old/quilt-0.50/configure 2011-12-05 21:59:01.000000000 +0100 +++ new/quilt-0.51/configure 2012-01-28 16:37:35.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for quilt 0.50. +# Generated by GNU Autoconf 2.63 for quilt 0.51. # # Report bugs to <[email protected]>. # @@ -597,8 +597,8 @@ # Identity of this package. PACKAGE_NAME='quilt' PACKAGE_TARNAME='quilt' -PACKAGE_VERSION='0.50' -PACKAGE_STRING='quilt 0.50' +PACKAGE_VERSION='0.51' +PACKAGE_STRING='quilt 0.51' PACKAGE_BUGREPORT='[email protected]' # Factoring default headers for most tests. @@ -1305,7 +1305,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures quilt 0.50 to adapt to many kinds of systems. +\`configure' configures quilt 0.51 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1366,7 +1366,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of quilt 0.50:";; + short | recursive ) echo "Configuration of quilt 0.51:";; esac cat <<\_ACEOF @@ -1483,7 +1483,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -quilt configure 0.50 +quilt configure 0.51 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1497,7 +1497,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by quilt $as_me 0.50, which was +It was created by quilt $as_me 0.51, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -1902,6 +1902,7 @@ PACKAGE_RELEASE=1 + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5805,7 +5806,7 @@ if test -z "$INTERNAL_MKTEMP" ; then { $as_echo "$as_me:$LINENO: checking whether $MKTEMP -d works" >&5 $as_echo_n "checking whether $MKTEMP -d works... " >&6; } - if tempdir=`$MKTEMP -d /tmp/$PACKAGE_NAME.XXXXXX 2>/dev/null` && \ + if tempdir=`$MKTEMP -d ${TMPDIR:-/tmp}/$PACKAGE_NAME.XXXXXX 2>/dev/null` && \ rmdir "$tempdir" ; then { $as_echo "$as_me:$LINENO: result: yes" >&5 $as_echo "yes" >&6; } @@ -6757,11 +6758,6 @@ fi -if test -n "$RPM_DOC_DIR" ; then - docdir="$RPM_DOC_DIR" -else - docdir='$(datadir)/doc' -fi @@ -7316,7 +7312,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by quilt $as_me 0.50, which was +This file was extended by quilt $as_me 0.51, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7366,7 +7362,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -quilt config.status 0.50 +quilt config.status 0.51 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/configure.ac new/quilt-0.51/configure.ac --- old/quilt-0.50/configure.ac 2011-12-05 21:58:49.000000000 +0100 +++ new/quilt-0.51/configure.ac 2012-01-28 16:37:00.000000000 +0100 @@ -1,11 +1,12 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([quilt],[0.50],[[email protected]]) +AC_INIT([quilt],[0.51],[[email protected]]) AC_CONFIG_AUX_DIR(config) AC_PREREQ(2.53) AC_REVISION ($Revision: 1.84 $) PACKAGE_RELEASE=1 AC_SUBST(PACKAGE_RELEASE) +AC_SUBST(PACKAGE_TARNAME) dnl Setup for backup-files compilation AC_HEADER_STDC @@ -216,7 +217,7 @@ QUILT_COMPAT_PROG_PATH(MKTEMP, mktemp) if test -z "$INTERNAL_MKTEMP" ; then AC_MSG_CHECKING(whether $MKTEMP -d works) - if tempdir=`$MKTEMP -d /tmp/$PACKAGE_NAME.XXXXXX 2>/dev/null` && \ + if tempdir=`$MKTEMP -d ${TMPDIR:-/tmp}/$PACKAGE_NAME.XXXXXX 2>/dev/null` && \ rmdir "$tempdir" ; then AC_MSG_RESULT(yes) else @@ -370,12 +371,6 @@ fi AC_SUBST(USE_NLS) -dnl Determine where package documentation is supposed to go -if test -n "$RPM_DOC_DIR" ; then - docdir="$RPM_DOC_DIR" -else - docdir='$(datadir)/doc' -fi AC_SUBST(docdir) dnl Check for rpmbuild (v4) vs. rpm (v3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/doc/quilt.1.in new/quilt-0.51/doc/quilt.1.in --- old/quilt-0.50/doc/quilt.1.in 2011-11-14 14:31:11.000000000 +0100 +++ new/quilt-0.51/doc/quilt.1.in 2011-12-06 17:44:39.000000000 +0100 @@ -224,7 +224,7 @@ .SH SEE ALSO -The pdf documentation, which should be under /usr/share/doc/quilt/quilt.pdf. +The pdf documentation, which should be under @DOCSUBDIR@/quilt.pdf. Note that some distributors compress this file. .BR zxpdf ( 1 ) can be used to display compressed pdf files. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/po/de.po new/quilt-0.51/po/de.po --- old/quilt-0.50/po/de.po 2011-12-05 21:21:03.000000000 +0100 +++ new/quilt-0.51/po/de.po 2012-01-28 15:46:14.000000000 +0100 @@ -1395,22 +1395,6 @@ msgid "Delivery address `%s' is invalid\n" msgstr "Zustelladresse `%s' ist ungültig\n" -#: quilt/scripts/parse-patch.in:50 -#, perl-format -msgid "USAGE: %s {-s|-u} section file [< replacement]\n" -msgstr "" - -#: quilt/scripts/parse-patch.in:101 quilt/scripts/parse-patch.in:108 -#: quilt/scripts/parse-patch.in:115 quilt/scripts/parse-patch.in:122 -#, fuzzy, perl-format -msgid "File %s disappeared!\n" -msgstr "Datei %s ist unverändert\\n" - -#: quilt/scripts/parse-patch.in:168 quilt/scripts/parse-patch.in:174 -#, fuzzy, perl-format -msgid "Failed to rename %s to %s: %s\n" -msgstr "Umbenennen von %s auf %s: %s\n" - #: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 #, fuzzy msgid "%s is not a regular file\\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/po/fr.po new/quilt-0.51/po/fr.po --- old/quilt-0.50/po/fr.po 2011-12-05 21:02:59.000000000 +0100 +++ new/quilt-0.51/po/fr.po 2012-01-28 15:46:14.000000000 +0100 @@ -1419,22 +1419,6 @@ msgid "Delivery address `%s' is invalid\n" msgstr "L'adresse de destination `%s' est invalide\n" -#: quilt/scripts/parse-patch.in:50 -#, perl-format -msgid "USAGE: %s {-s|-u} section file [< replacement]\n" -msgstr "USAGE : %s {-s|-u} section fichier [< remplacement]\n" - -#: quilt/scripts/parse-patch.in:101 quilt/scripts/parse-patch.in:108 -#: quilt/scripts/parse-patch.in:115 quilt/scripts/parse-patch.in:122 -#, perl-format -msgid "File %s disappeared!\n" -msgstr "Le fichier %s a disparu !\n" - -#: quilt/scripts/parse-patch.in:168 quilt/scripts/parse-patch.in:174 -#, perl-format -msgid "Failed to rename %s to %s: %s\n" -msgstr "Impossible de renommer %s en %s : %s\n" - #: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 msgid "%s is not a regular file\\n" msgstr "%s n'est pas un fichier régulier\\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/po/ja.po new/quilt-0.51/po/ja.po --- old/quilt-0.50/po/ja.po 2011-12-05 20:58:38.000000000 +0100 +++ new/quilt-0.51/po/ja.po 2012-01-28 15:46:14.000000000 +0100 @@ -1379,22 +1379,6 @@ msgid "Delivery address `%s' is invalid\n" msgstr "配送先のアドレス `%s' が不正です\n" -#: quilt/scripts/parse-patch.in:50 -#, perl-format -msgid "USAGE: %s {-s|-u} section file [< replacement]\n" -msgstr "" - -#: quilt/scripts/parse-patch.in:101 quilt/scripts/parse-patch.in:108 -#: quilt/scripts/parse-patch.in:115 quilt/scripts/parse-patch.in:122 -#, fuzzy, perl-format -msgid "File %s disappeared!\n" -msgstr "ファイル %s に変更はありません\\n" - -#: quilt/scripts/parse-patch.in:168 quilt/scripts/parse-patch.in:174 -#, fuzzy, perl-format -msgid "Failed to rename %s to %s: %s\n" -msgstr "%s から %s へ名前を変更しました: %s\n" - #: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 msgid "%s is not a regular file\\n" msgstr "%s は普通のファイルではありません\\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/po/quilt.pot new/quilt-0.51/po/quilt.pot --- old/quilt-0.50/po/quilt.pot 2011-12-05 20:58:38.000000000 +0100 +++ new/quilt-0.51/po/quilt.pot 2012-01-28 15:46:14.000000000 +0100 @@ -951,22 +951,6 @@ msgid "Delivery address `%s' is invalid\n" msgstr "" -#: quilt/scripts/parse-patch.in:50 -#, perl-format -msgid "USAGE: %s {-s|-u} section file [< replacement]\n" -msgstr "" - -#: quilt/scripts/parse-patch.in:101 quilt/scripts/parse-patch.in:108 -#: quilt/scripts/parse-patch.in:115 quilt/scripts/parse-patch.in:122 -#, perl-format -msgid "File %s disappeared!\n" -msgstr "" - -#: quilt/scripts/parse-patch.in:168 quilt/scripts/parse-patch.in:174 -#, perl-format -msgid "Failed to rename %s to %s: %s\n" -msgstr "" - #: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 msgid "%s is not a regular file\\n" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/po/ru.po new/quilt-0.51/po/ru.po --- old/quilt-0.50/po/ru.po 2011-12-05 20:58:38.000000000 +0100 +++ new/quilt-0.51/po/ru.po 2012-01-28 15:46:14.000000000 +0100 @@ -1306,22 +1306,6 @@ msgid "Delivery address `%s' is invalid\n" msgstr "Некорректный адрес назначения '%s'\n" -#: quilt/scripts/parse-patch.in:50 -#, perl-format -msgid "USAGE: %s {-s|-u} section file [< replacement]\n" -msgstr "СИНТАКСИС: %s {-s|-u} секция файл [< замена]\n" - -#: quilt/scripts/parse-patch.in:101 quilt/scripts/parse-patch.in:108 -#: quilt/scripts/parse-patch.in:115 quilt/scripts/parse-patch.in:122 -#, perl-format -msgid "File %s disappeared!\n" -msgstr "Файл %s исчез!\n" - -#: quilt/scripts/parse-patch.in:168 quilt/scripts/parse-patch.in:174 -#, perl-format -msgid "Failed to rename %s to %s: %s\n" -msgstr "Не удалось переименовать %s в %s: %s\n" - #: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 #, fuzzy msgid "%s is not a regular file\\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/quilt/mail.in new/quilt-0.51/quilt/mail.in --- old/quilt-0.50/quilt/mail.in 2011-11-14 14:31:11.000000000 +0100 +++ new/quilt-0.51/quilt/mail.in 2012-01-23 20:49:24.000000000 +0100 @@ -370,10 +370,14 @@ # addresses that contain commas and add quotes, e.g., # Last, First <email> => "Last, First" <email> + set -- Signed-off-by Acked-by Suggested-by Reviewed-by Requested-by Reported-by Tested-by + set -- "$*" + set -- ${*// /\\|} + sed -n -e "/\<${LOGNAME:-$(whoami)}@/d" \ -e 's/^\(To\|Cc\):/Recipient-\1:/ip' \ - -e 's/^\(\(Signed-off-by\|Acked-by\):[ '$'\t'']*\)\([^"]*\(,[^"]*\)\+[^" '$'\t'']\)\([ '$'\t'']*<.*>\)/\1"\3"\5/i' \ - -e 's/^\(Signed-off-by\|Acked-by\):/Recipient-Cc:/ip' \ + -e 's/^\(\('"$*"'\):[ '$'\t'']*\)\([^"]*\(,[^"]*\)\+[^" '$'\t'']\)\([ '$'\t'']*<.*>\)/\1"\3"\5/i' \ + -e 's/^\('"$*"'\):/Recipient-Cc:/ip' \ $tmpdir/header echo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/quilt/new.in new/quilt-0.51/quilt/new.in --- old/quilt-0.50/quilt/new.in 2011-02-01 10:18:22.000000000 +0100 +++ new/quilt-0.51/quilt/new.in 2012-01-03 10:32:03.000000000 +0100 @@ -83,6 +83,12 @@ usage fi +if [ "$QUILT_PATCHES" = "$QUILT_PC" ] +then + printf $"QUILT_PATCHES(%s) must differ from QUILT_PC(%s)\n" "$QUILT_PATCHES" "$QUILT_PC" + exit 1 +fi + patch=${1#$QUILT_PATCHES/} if patch_in_series $patch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/quilt/scripts/edmail.in new/quilt-0.51/quilt/scripts/edmail.in --- old/quilt-0.50/quilt/scripts/edmail.in 2011-11-14 14:31:11.000000000 +0100 +++ new/quilt-0.51/quilt/scripts/edmail.in 2011-12-08 16:31:45.000000000 +0100 @@ -128,11 +128,12 @@ 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 @@ my ($name, $value); return unless defined $_; - unless (($name, $value) = /^([\41-\176]+):\s*(.*)\s*/s) { + unless (($name, $value) = /^([\41-\176]+):\s*(.*)/s) { print; return } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/quilt/scripts/inspect.in new/quilt-0.51/quilt/scripts/inspect.in --- old/quilt-0.50/quilt/scripts/inspect.in 2011-11-14 22:09:20.000000000 +0100 +++ new/quilt-0.51/quilt/scripts/inspect.in 2012-01-23 20:49:34.000000000 +0100 @@ -61,18 +61,19 @@ specdir=$PWD fi -tmpdir="$(gen_tempfile -d ${TMPDIR-/var/tmp}/${0##*/})" +tmpdir="$(gen_tempfile -d ${VARTMPDIR:-/var/tmp}/${0##*/})" mkdir -p $tmpdir || exit 1 add_exit_handler "rm -rf $tmpdir" mkdir -p $tmpdir/build mkdir -p $tmpdir/bin # Redirect file descriptors +# 5 is used in verbose mode, 4 in non-verbose mode, and 2 for both (real errors) if [ -n "$verbose" ] then - exec 3>&1 4>/dev/null + exec 3>&1 5>&2 4>/dev/null else - exec 3>&1 4>&2 2>/dev/null + exec 3>&1 4>&2 5>/dev/null fi # create md5 sums, also for uncompressed files @@ -88,7 +89,7 @@ esac [ -f "$file" ] || continue echo -n "." >&4 - echo "md5sum < $file" >&2 + echo "md5sum < $file" >&5 set -- $(md5sum < "$file") echo "$1 $basename" @@ -110,25 +111,25 @@ case "$filetype" in compress*|gzip*) echo -n "g" >&4 - echo "gzip -cd $file | md5sum" >&2 + echo "gzip -cd $file | md5sum" >&5 set -- $(gzip -cd "$file" | md5sum) echo "$1 $basename" ;; bzip2*) echo -n "b" >&4 - echo "bzip2 -cd $file | md5sum" >&2 + echo "bzip2 -cd $file | md5sum" >&5 set -- $(bzip2 -cd "$file" | md5sum) echo "$1 $basename" ;; xz*|XZ*) echo -n "x" >&4 - echo "xz -cd $file | md5sum" >&2 + echo "xz -cd $file | md5sum" >&5 set -- $(xz -cd "$file" | md5sum) echo "$1 $basename" ;; lzma*) echo -n "l" >&4 - echo "lzma -cd $file | md5sum" >&2 + echo "lzma -cd $file | md5sum" >&5 set -- $(lzma -cd "$file" | md5sum) echo "$1 $basename" ;; @@ -266,6 +267,8 @@ ;; tar) inputfile=$(tar_input_file "$@") + # For tar, file - means read from stdin + [ "$inputfile" = "-" ] && inputfile= ;; esac if [ -z "$inputfile" ]; then @@ -314,7 +317,18 @@ ${0##*/} "$@" < $tmpdir/data fi EOF + chmod 755 $tmpdir/bin/wrapper +# If $TMPDIR is mounted with noexec, rpmbuild won't be able to execute +# our wrapper script +if [ ! -x $tmpdir/bin/wrapper ] +then + printf "Cannot execute %s; filesystem mounted with noexec?\n" \ + $tmpdir/bin/wrapper >&2 + printf "Setting %s in ~/.quiltrc may help\n" "VARTMPDIR" >&2 + exit 1 +fi + ln -s wrapper $tmpdir/bin/patch ln -s wrapper $tmpdir/bin/tar @@ -329,7 +343,7 @@ --eval "%define __tar $tmpdir/bin/tar" \ --eval "$DEFINE_FUZZ" \ --nodeps \ - -bp "$specdir/$specfile" < /dev/null >&2 + -bp "$specdir/$specfile" < /dev/null >&5 2>&5 status=$? echo >&4 exit $status diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/quilt/scripts/parse-patch.in new/quilt-0.51/quilt/scripts/parse-patch.in --- old/quilt-0.50/quilt/scripts/parse-patch.in 2009-11-27 15:24:42.000000000 +0100 +++ new/quilt-0.51/quilt/scripts/parse-patch.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,178 +0,0 @@ -#!@PERL@ -w - -# This script is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# See the COPYING and AUTHORS files for more details. - -# Extract or update a section from a combined patch + documentation + -# meta information file. - -use FileHandle; -use Getopt::Long; -use File::Temp qw(tempfile); -use strict; - -# This ugly trick lets the script work even if gettext support is missing. -# We did so because Locale::gettext doesn't ship with the standard perl -# distribution. -BEGIN { - if (eval { require Locale::gettext }) { - import Locale::gettext; - require POSIX; - import POSIX, qw(setlocale); - } else { - eval ' - use constant LC_MESSAGES => 0; - sub setlocale($$) { } - sub bindtextdomain($$) { } - sub textdomain($) { } - sub gettext($) { shift } - ' - } -} - -setlocale(LC_MESSAGES, ""); -bindtextdomain("quilt", "@LOCALEDIR@"); -textdomain("quilt"); - -sub _($) { - return gettext(shift); -} - -my $select; -my $update; - -if (!GetOptions("s|select=s" => \$select, - "u|update=s" => \$update) || - (!defined $select && !defined $update)) { - print STDERR sprintf(_("USAGE: %s {-s|-u} section file [< replacement]\n"), $0); - exit 1; -} - -foreach my $arg (@ARGV) { - my $fh; - - if (! -e $arg) { - $fh = new FileHandle("/dev/null"); - } elsif ($arg =~ /\.gz$/) { - $fh = new FileHandle("gzip -cd $arg |"); - } elsif ($arg =~ /\.bz2$/) { - $fh = new FileHandle("bzip2 -cd $arg |"); - } elsif ($arg =~ /\.xz$/) { - $fh = new FileHandle("xz -cd $arg |"); - } elsif ($arg =~ /\.lzma$/) { - $fh = new FileHandle("lzma -cd $arg |"); - } else { - $fh = new FileHandle("< $arg"); - } - - unless ($fh) { - print STDERR "$arg: $!\n"; - next; - } - - if (defined $select) { - my $section = "head"; - my $newline = ""; - while (<$fh>) { - if (/^%(.*)/) { - last if $section eq $select; - $section = $1; - next; - } - if ($section eq $select) { - print $newline; - if ($_ eq "\n") { - $newline = $_; - } else { - $newline=""; - print; - } - } - } - } elsif (defined $update) { - my ($fh2, $tempname) = tempfile("$arg.XXXXXX"); - if ($arg =~ /\.gz$/) { - $fh2->close(); - if (! -e $tempname) { - die sprintf( -_("File %s disappeared!\n"), $tempname); - } - $fh2 = new FileHandle("| gzip -c > $tempname"); - } elsif ($arg =~ /\.bz2$/) { - $fh2->close(); - if (! -e $tempname) { - die sprintf( -_("File %s disappeared!\n"), $tempname); - } - $fh2 = new FileHandle("| bzip2 -c > $tempname"); - } elsif ($arg =~ /\.xz$/) { - $fh2->close(); - if (! -e $tempname) { - die sprintf( -_("File %s disappeared!\n"), $tempname); - } - $fh2 = new FileHandle("| xz -c > $tempname"); - } elsif ($arg =~ /\.lzma$/) { - $fh2->close(); - if (! -e $tempname) { - die sprintf( -_("File %s disappeared!\n"), $tempname); - } - $fh2 = new FileHandle("| lzma -c > $tempname"); - } - unless ($fh2) { - die "$tempname: $!\n"; - } - - # Copy things before updated section - my $last_was_newline=1; # start first section in first line - while (<$fh>) { - if (/^%(.*)/ && $1 eq $update) { - last; - } - $last_was_newline = ($_ eq "\n"); - print $fh2 $_; - } - print $fh2 "\n" - unless ($last_was_newline); - - # Create/replace updated section - print $fh2 "%$update\n"; - while (<STDIN>) { - print $fh2 $_; - } - print $fh2 "\n"; - - # Skip obsolete section - while (<$fh>) { - if (/^%(.*)/) { - print $fh2 $_; - last; - } - } - # Copy things after updated section - while (<$fh>) { - print $fh2 $_; - } - unless (close $fh2) { - die "$arg.patch: $!\n"; - } - - if (-e $arg) { - unlink "$arg~"; - unless (rename $arg, "$arg~") { - die sprintf( -_("Failed to rename %s to %s: %s\n"), $arg, "$arg~", $!); - } - } - unless (rename $tempname, $arg) { - rename("$arg~", $arg); - die sprintf( -_("Failed to rename %s to %s: %s\n"), $tempname, $arg, $!); - } - } - close $fh; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/quilt.changes new/quilt-0.51/quilt.changes --- old/quilt-0.50/quilt.changes 2011-12-05 22:00:51.000000000 +0100 +++ new/quilt-0.51/quilt.changes 2012-01-28 16:38:26.000000000 +0100 @@ -1,4 +1,102 @@ ------------------------------------------------------------------- +Sat Jan 28 16:38:10 CET 2012 - [email protected] + +- configure*: Bump version to 0.51. + +------------------------------------------------------------------- +Sat Jan 28 15:47:53 CET 2012 - [email protected] + +- Remove parse-patch which is no longer used. Based on a + preliminary patch by Yasushi SHOJI. + + None of quilt code uses parse-patch anymore. The last one, it seems, + was contrib/import.diff, which was removed at 2f9728a9. So, just + remove it. + +------------------------------------------------------------------- +Mon Jan 23 13:56:57 CET 2012 - [email protected] + +- scripts/inspect.in: Leave stderr free for actual error reporting. +- scripts/inspect.in: Complain if wrapper script can't be executed. + +------------------------------------------------------------------- +Mon Jan 23 10:20:16 CET 2012 - [email protected] + +- bash_completion: silence the errors of "quilt unapplied" in the + completion of quilt push, as we did previously on other scripts. + +------------------------------------------------------------------- +Tue Jan 10 11:05:36 CET 2012 - [email protected] + +- Makefile.in: No need to delete doc/quilt.1 twice on "make clean". +- Makefile.in: Silent the generation of the quilt manual page, for + consistency. +- Makefile.in: Store the quilt command reference once generated. + This avoids generating it twice, once for README and once for + quilt.1. + +------------------------------------------------------------------- +Mon Jan 9 20:49:04 CET 2012 - [email protected] + +- Makefile.in: + - revert the change to fix the generation of quilt.1 with dash + It induced relying on GNU sed, which introduce severe portability + issues as BSD and Mac OSX versions of sed (at least) cannot deal + with \n by themselves. + - Force it to use SHELL = @BASH@ to ensure that it works when dash + is the default shell (bash is installed anyway since our scripts + use it) + +------------------------------------------------------------------- +Mon Jan 2 11:02:38 CET 2012 - [email protected] + +- Makefile.in: Fix auto-generation of quilt.1 to work with dash +- quilt/new: add a check that QUILT_PATCHES != QUILT_PC. + Rational: If QUILT_PATCHES and QUILT_PC are set to the same directory, + the awk script in filenames_in_patch (in scripts/patchfns) will + break with a '<patchname> is a directory' error. + Patch provided by anonymous in #30956 on savannah + +------------------------------------------------------------------- +Fri Dec 16 16:01:38 CET 2011 - [email protected] + +- Makefile.in: Really skip setting execute bit on scripts/patchfns. + +------------------------------------------------------------------- +Fri Dec 16 15:56:46 CET 2011 - [email protected] + +- configure*, Makefile.in: Use the standard docdir definition, so + that it can be easily changed from the command line. + +------------------------------------------------------------------- +Thu Dec 15 14:20:04 CET 2011 - [email protected] + +- scripts/inspect.in: Don't let TMPDIR take over /var/tmp. + +------------------------------------------------------------------- +Thu Dec 15 13:53:35 CET 2011 - [email protected] + +- scripts/inspect.in: Fix quilt setup. A file name of "-" means + "read from stdin" for tar. + +------------------------------------------------------------------- +Thu Dec 8 16:42:24 CET 2011 - [email protected] + +- scripts/inspect.in: Consistently use ${TMPDIR:-...} when testing + if TMPDIR is set. + +------------------------------------------------------------------- +Thu Dec 8 16:32:26 CET 2011 - [email protected] + +- configure*: Honor $TMPDIR if set. + +------------------------------------------------------------------- +Tue Dec 6 17:44:55 CET 2011 - [email protected] + +- Makefile.in, doc/quilt.1.in: Substitute documentation directory + name in path to PDF documentation. + +------------------------------------------------------------------- Mon Dec 5 22:00:00 CET 2011 - [email protected] - configure*: Bump version to 0.50. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/quilt.spec new/quilt-0.51/quilt.spec --- old/quilt-0.50/quilt.spec 2011-12-05 22:03:22.000000000 +0100 +++ new/quilt-0.51/quilt.spec 2012-01-28 17:07:27.000000000 +0100 @@ -6,7 +6,7 @@ Summary: Scripts for working with series of patches License: GPL Group: Productivity/Text/Utilities -Version: 0.50 +Version: 0.51 Release: 1 Requires: coreutils diffutils findutils patch gzip bzip2 perl mktemp gettext Autoreqprov: off @@ -57,6 +57,62 @@ %doc %{_docdir}/%{name}-%{version}/quilt.pdf %changelog +* Sat Jan 28 2012 - [email protected] +- configure*: Bump version to 0.51. +* Sat Jan 28 2012 - [email protected] +- Remove parse-patch which is no longer used. Based on a + preliminary patch by Yasushi SHOJI. + None of quilt code uses parse-patch anymore. The last one, it seems, + was contrib/import.diff, which was removed at 2f9728a9. So, just + remove it. +* Mon Jan 23 2012 - [email protected] +- scripts/inspect.in: Leave stderr free for actual error reporting. +- scripts/inspect.in: Complain if wrapper script can't be executed. +* Mon Jan 23 2012 - [email protected] +- bash_completion: silence the errors of "quilt unapplied" in the + completion of quilt push, as we did previously on other scripts. +* Tue Jan 10 2012 - [email protected] +- Makefile.in: No need to delete doc/quilt.1 twice on "make clean". +- Makefile.in: Silent the generation of the quilt manual page, for + consistency. +- Makefile.in: Store the quilt command reference once generated. + This avoids generating it twice, once for README and once for + quilt.1. +* Mon Jan 09 2012 - [email protected] +- Makefile.in: + - revert the change to fix the generation of quilt.1 with dash + It induced relying on GNU sed, which introduce severe portability + issues as BSD and Mac OSX versions of sed (at least) cannot deal + with + by themselves. + - Force it to use SHELL = @BASH@ to ensure that it works when dash + is the default shell (bash is installed anyway since our scripts + use it) +* Mon Jan 02 2012 - [email protected] +- Makefile.in: Fix auto-generation of quilt.1 to work with dash +- quilt/new: add a check that QUILT_PATCHES != QUILT_PC. + Rational: If QUILT_PATCHES and QUILT_PC are set to the same directory, + the awk script in filenames_in_patch (in scripts/patchfns) will + break with a '<patchname> is a directory' error. + Patch provided by anonymous in #30956 on savannah +* Fri Dec 16 2011 - [email protected] +- Makefile.in: Really skip setting execute bit on scripts/patchfns. +* Fri Dec 16 2011 - [email protected] +- configure*, Makefile.in: Use the standard docdir definition, so + that it can be easily changed from the command line. +* Thu Dec 15 2011 - [email protected] +- scripts/inspect.in: Don't let TMPDIR take over /var/tmp. +* Thu Dec 15 2011 - [email protected] +- scripts/inspect.in: Fix quilt setup. A file name of "-" means + "read from stdin" for tar. +* Thu Dec 08 2011 - [email protected] +- scripts/inspect.in: Consistently use ${TMPDIR:-...} when testing + if TMPDIR is set. +* Thu Dec 08 2011 - [email protected] +- configure*: Honor $TMPDIR if set. +* Tue Dec 06 2011 - [email protected] +- Makefile.in, doc/quilt.1.in: Substitute documentation directory + name in path to PDF documentation. * Mon Dec 05 2011 - [email protected] - configure*: Bump version to 0.50. * Mon Dec 05 2011 - [email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilt-0.50/test/perms.test new/quilt-0.51/test/perms.test --- old/quilt-0.50/test/perms.test 2010-01-23 21:23:01.000000000 +0100 +++ new/quilt-0.51/test/perms.test 2012-01-23 20:49:24.000000000 +0100 @@ -3,7 +3,7 @@ $ echo foo > foo $ chmod 704 foo - $ ls -l foo | awk '{ print $1,$NF }' + $ ls -l foo | awk '{ print substr($1, 1, 10), $NF }' > -rwx---r-- foo $ quilt new test.diff @@ -12,7 +12,7 @@ $ quilt add foo > File foo added to patch %{P}test.diff - $ ls -l foo | awk '{ print $1,$NF }' + $ ls -l foo | awk '{ print substr($1, 1, 10), $NF }' > -rwx---r-- foo $ echo foobar > foo @@ -26,7 +26,7 @@ > File foo added to patch %{P}test2.diff $ chmod 702 foo - $ ls -l foo | awk '{ print $1,$NF }' + $ ls -l foo | awk '{ print substr($1, 1, 10), $NF }' > -rwx----w- foo $ echo foobaz > foo @@ -41,14 +41,14 @@ > Removing patch %{P}test2.diff > Now at patch %{P}test.diff - $ ls -l foo | awk '{ print $1,$NF }' + $ ls -l foo | awk '{ print substr($1, 1, 10), $NF }' > -rwx---r-- foo $ quilt push -q > Applying patch %{P}test2.diff > Now at patch %{P}test2.diff - $ ls -l foo | awk '{ print $1,$NF }' + $ ls -l foo | awk '{ print substr($1, 1, 10), $NF }' > -rwx---r-- foo $ quilt pop -q ++++++ suse-workaround-pseudo-release.patch ++++++ --- /var/tmp/diff_new_pack.6DuZrx/_old 2012-02-03 10:26:18.000000000 +0100 +++ /var/tmp/diff_new_pack.6DuZrx/_new 2012-02-03 10:26:18.000000000 +0100 @@ -4,9 +4,13 @@ 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 +--- + quilt/scripts/inspect.in | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- quilt-0.51.orig/quilt/scripts/inspect.in ++++ quilt-0.51/quilt/scripts/inspect.in +@@ -67,6 +67,14 @@ add_exit_handler "rm -rf $tmpdir" mkdir -p $tmpdir/build mkdir -p $tmpdir/bin @@ -19,5 +23,5 @@ +fi + # Redirect file descriptors + # 5 is used in verbose mode, 4 in non-verbose mode, and 2 for both (real errors) if [ -n "$verbose" ] - then -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
