From 08912b45d931109d34e1345f8e36c50f23cbc8af5f827f0696e634e2c7405667 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 29 Jan 2012 19:26:04 +0000 Subject: [PATCH 1/3] - 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. OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=50 --- change-docdir-definition.patch | 102 ---------------------- fix-inspect.patch | 20 ----- inspect-check-if-wrapper-executable.patch | 31 ------- inspect-remap-outputs.patch | 70 --------------- mail-fix-delivery-address-checking.patch | 37 -------- patchfns-non-exec.patch | 14 --- quilt-0.50.tar.bz2 | 3 - quilt-0.51.tar.bz2 | 3 + quilt.changes | 12 +++ quilt.spec | 16 +--- substitute-docdir-in-man-page.patch | 51 ----------- suse-workaround-pseudo-release.patch | 12 ++- 12 files changed, 24 insertions(+), 347 deletions(-) delete mode 100644 change-docdir-definition.patch delete mode 100644 fix-inspect.patch delete mode 100644 inspect-check-if-wrapper-executable.patch delete mode 100644 inspect-remap-outputs.patch delete mode 100644 mail-fix-delivery-address-checking.patch delete mode 100644 patchfns-non-exec.patch delete mode 100644 quilt-0.50.tar.bz2 create mode 100644 quilt-0.51.tar.bz2 delete mode 100644 substitute-docdir-in-man-page.patch diff --git a/change-docdir-definition.patch b/change-docdir-definition.patch deleted file mode 100644 index d2456ed..0000000 --- a/change-docdir-definition.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- - Makefile.in | 13 +++++++------ - configure.ac | 7 +------ - 2 files changed, 8 insertions(+), 12 deletions(-) - ---- a/Makefile.in -+++ b/Makefile.in -@@ -1,6 +1,7 @@ - PACKAGE := @PACKAGE_NAME@ - VERSION := @PACKAGE_VERSION@ - RELEASE := @PACKAGE_RELEASE@ -+PACKAGE_TARNAME := @PACKAGE_TARNAME@ - PACKAGE_BUGREPORT := @PACKAGE_BUGREPORT@ - - prefix := @prefix@ -@@ -213,7 +214,7 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=qu - ;; \ - *@DOCSUBDIR@*) \ - echo "$$line" | \ -- $(SED) -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \ -+ $(SED) -e 's:@DOCSUBDIR''@:$(docdir):g' \ - ;; \ - *) \ - echo "$$line" \ -@@ -272,7 +273,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):g' \ - $< > $@ - @$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@) - -@@ -331,11 +332,11 @@ endif - $(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/ -@@ -373,7 +374,7 @@ uninstall :: - $(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) ---- a/configure.ac -+++ b/configure.ac -@@ -6,6 +6,7 @@ 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 -@@ -370,12 +371,6 @@ if test $USE_NLS = no ; then - 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) ---- a/configure -+++ b/configure -@@ -1902,6 +1902,7 @@ ac_configure="$SHELL $ac_aux_dir/configu - PACKAGE_RELEASE=1 - - -+ - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -6757,11 +6758,6 @@ $as_echo "$as_me: Building without natur - fi - - --if test -n "$RPM_DOC_DIR" ; then -- docdir="$RPM_DOC_DIR" --else -- docdir='$(datadir)/doc' --fi - - - diff --git a/fix-inspect.patch b/fix-inspect.patch deleted file mode 100644 index 532a173..0000000 --- a/fix-inspect.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Jean Delvare -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 diff --git a/inspect-check-if-wrapper-executable.patch b/inspect-check-if-wrapper-executable.patch deleted file mode 100644 index d74619d..0000000 --- a/inspect-check-if-wrapper-executable.patch +++ /dev/null @@ -1,31 +0,0 @@ -inspect: Complain if wrapper script can't be executed. - -There is no guarantee that the wrapper script can be executed. -For example user can mount their temporary directories with noexec -for security reasons. Instead of failing with no explanation, -complain when this situation is detected. ---- - quilt/scripts/inspect.in | 11 +++++++++++ - 1 file changed, 11 insertions(+) - ---- a/quilt/scripts/inspect.in -+++ b/quilt/scripts/inspect.in -@@ -317,7 +317,18 @@ cat <<-'EOF' > $tmpdir/bin/wrapper - ${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 - diff --git a/inspect-remap-outputs.patch b/inspect-remap-outputs.patch deleted file mode 100644 index fab5bd4..0000000 --- a/inspect-remap-outputs.patch +++ /dev/null @@ -1,70 +0,0 @@ -inspect: Leave stderr free for actual error reporting. ---- - quilt/scripts/inspect.in | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - ---- quilt-0.50.orig/quilt/scripts/inspect.in -+++ quilt-0.50/quilt/scripts/inspect.in -@@ -76,11 +76,12 @@ then - 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 -- 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 -@@ -96,7 +97,7 @@ do - esac - [ -f "$file" ] || continue - echo -n "." >&4 -- echo "md5sum < $file" >&2 -+ echo "md5sum < $file" >&5 - set -- $(md5sum < "$file") - echo "$1 $basename" - -@@ -118,25 +119,25 @@ do - 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" - ;; -@@ -339,7 +340,7 @@ rpmbuild --eval "%define _sourcedir $sou - --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 --git a/mail-fix-delivery-address-checking.patch b/mail-fix-delivery-address-checking.patch deleted file mode 100644 index d4d53db..0000000 --- a/mail-fix-delivery-address-checking.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 00e551287a23749c7d1b0bc3e25741a5bd360bcd Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -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 diff --git a/patchfns-non-exec.patch b/patchfns-non-exec.patch deleted file mode 100644 index 79fde71..0000000 --- a/patchfns-non-exec.patch +++ /dev/null @@ -1,14 +0,0 @@ -Really skip setting execute bit on scripts/patchfns. -Index: quilt/Makefile.in -=================================================================== ---- quilt.orig/Makefile.in -+++ quilt/Makefile.in -@@ -275,7 +275,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu - -e 's:@LOCALEDIR''@:$(localedir):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 - diff --git a/quilt-0.50.tar.bz2 b/quilt-0.50.tar.bz2 deleted file mode 100644 index 6a1c674..0000000 --- a/quilt-0.50.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cdb5480856db1c06e386fe89ca24a6333a010bcd2641e3af35fd5e91b5e4f3a -size 395273 diff --git a/quilt-0.51.tar.bz2 b/quilt-0.51.tar.bz2 new file mode 100644 index 0000000..90881a7 --- /dev/null +++ b/quilt-0.51.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d14b03f6e743031b3eede12284b1ebe38c38569c395562e12712c4f36c0d2c82 +size 396133 diff --git a/quilt.changes b/quilt.changes index 98010e8..4998b14 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Jan 29 20:22:18 CET 2012 - jdelvare@suse.de + +- 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. + ------------------------------------------------------------------- Tue Jan 17 21:34:30 CET 2012 - jdelvare@suse.de diff --git a/quilt.spec b/quilt.spec index a9277d9..4785181 100644 --- a/quilt.spec +++ b/quilt.spec @@ -23,7 +23,7 @@ BuildRequires: diffstat ed emacs-nox procmail Summary: A Tool for Working with Many Patches License: GPLv2+ 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,9 @@ AutoReqProv: off Source: %{name}-%{version}.tar.bz2 Source1: suse-start-quilt-mode.el Patch1: expand.diff -Patch2: substitute-docdir-in-man-page.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 @@ -66,16 +59,9 @@ Authors: %prep %setup -q %patch1 -p1 -%patch2 -p1 %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: diff --git a/substitute-docdir-in-man-page.patch b/substitute-docdir-in-man-page.patch deleted file mode 100644 index f6f809d..0000000 --- a/substitute-docdir-in-man-page.patch +++ /dev/null @@ -1,51 +0,0 @@ -From eccbe8d7db4dfcbcd6a5c3f7c1949c9681f3faf0 Mon Sep 17 00:00:00 2001 -From: Jean Delvare -Date: Tue, 06 Dec 2011 16:48:01 +0000 -Subject: Man page: substitute documentation directory name in path to PDF documentation - ---- -diff --git a/Makefile.in b/Makefile.in -index bdf015d..2ddea7e 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -211,6 +211,10 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) $(COMPAT) - -e $$'s/^ \\(-[^\t]*\\)\t\\?/.IP " \\1" 8\\\n/' \ - -e $$'s/^ \t\\?//' \ - ;; \ -+ *@DOCSUBDIR@*) \ -+ echo "$$line" | \ -+ $(SED) -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \ -+ ;; \ - *) \ - echo "$$line" \ - ;; \ -diff --git a/doc/quilt.1.in b/doc/quilt.1.in -index 1c1dcc2..db91b14 100644 ---- a/doc/quilt.1.in -+++ b/doc/quilt.1.in -@@ -224,7 +224,7 @@ the pdf documentation, and in the help messages of each commands. - - .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 --git a/quilt.changes b/quilt.changes -index 24d2ef7..2054e1f 100644 ---- a/quilt.changes -+++ b/quilt.changes -@@ -1,4 +1,10 @@ - ------------------------------------------------------------------- -+Tue Dec 6 17:44:55 CET 2011 - jdelvare@suse.de -+ -+- Makefile.in, doc/quilt.1.in: Substitute documentation directory -+ name in path to PDF documentation. -+ -+------------------------------------------------------------------- - Mon Dec 5 22:00:00 CET 2011 - jdelvare@suse.de - - - configure*: Bump version to 0.50. --- -cgit v0.9.0.2 diff --git a/suse-workaround-pseudo-release.patch b/suse-workaround-pseudo-release.patch index a54f50b..fd7ee3b 100644 --- a/suse-workaround-pseudo-release.patch +++ b/suse-workaround-pseudo-release.patch @@ -4,9 +4,13 @@ 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 +--- + 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 @@ happy again. Packages in openSUSE 11.4 and later no longer need this. +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 From bfdef7a078094434345e2094f32d59dddc7ef47e4da1e34f90836edd8f7d13e3 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 30 Jan 2012 12:51:09 +0000 Subject: [PATCH 2/3] - fix-relative-import.patch: Fix import of relative patches (savannah#35244). OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=51 --- fix-relative-import.patch | 82 +++++++++++++++++++++++++++++++++++++++ quilt.changes | 6 +++ quilt.spec | 2 + 3 files changed, 90 insertions(+) create mode 100644 fix-relative-import.patch diff --git a/fix-relative-import.patch b/fix-relative-import.patch new file mode 100644 index 0000000..8646b59 --- /dev/null +++ b/fix-relative-import.patch @@ -0,0 +1,82 @@ +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 diff --git a/quilt.changes b/quilt.changes index 4998b14..014a1e7 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 30 13:49:59 CET 2012 - jdelvare@suse.de + +- fix-relative-import.patch: Fix import of relative patches + (savannah#35244). + ------------------------------------------------------------------- Sun Jan 29 20:22:18 CET 2012 - jdelvare@suse.de diff --git a/quilt.spec b/quilt.spec index 4785181..512fc4c 100644 --- a/quilt.spec +++ b/quilt.spec @@ -36,6 +36,7 @@ AutoReqProv: off Source: %{name}-%{version}.tar.bz2 Source1: suse-start-quilt-mode.el Patch1: expand.diff +Patch2: fix-relative-import.patch Patch3: patch-wrapper-rpm.diff Patch4: grep-support-spaces.patch Patch5: suse-workaround-pseudo-release.patch @@ -59,6 +60,7 @@ Authors: %prep %setup -q %patch1 -p1 +%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 From a9e4c51db4eea0a8a2745927284d1826ca73d565106267ed8b65addeb04873fa Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 1 Feb 2012 15:03:09 +0000 Subject: [PATCH 3/3] - Fix license string to make rpmlint happy. OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=52 --- quilt.changes | 5 +++++ quilt.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/quilt.changes b/quilt.changes index 014a1e7..39a722d 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 1 16:01:36 CET 2012 - jdelvare@suse.de + +- Fix license string to make rpmlint happy. + ------------------------------------------------------------------- Mon Jan 30 13:49:59 CET 2012 - jdelvare@suse.de diff --git a/quilt.spec b/quilt.spec index 512fc4c..c14ed66 100644 --- a/quilt.spec +++ b/quilt.spec @@ -21,7 +21,7 @@ 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.51 Release: 1