Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at 2015-01-30 23:57:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quilt (Old) and /work/SRC/openSUSE:Factory/.quilt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "quilt" Changes: -------- --- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2014-12-17 19:16:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2015-01-30 23:57:31.000000000 +0100 @@ -1,0 +2,18 @@ +Wed Jan 28 12:15:51 CET 2015 - jdelvare@suse.de + +- dont-substitute-release.patch: mail: Don't include the release + number in User-Agent. + +------------------------------------------------------------------- +Wed Jan 28 11:40:19 CET 2015 - jdelvare@suse.de + +- Update upstream references. +- quilt-el-fix-tramp-support.patch: quilt-el: Fix tramp support. +- quilt-el-fix-patch-select-completion.patch: quilt-el: Fix patch + select completion. +- hackweek-11-13-setup-let-normalize_path-deal-with-dot.patch: + setup: Let normalize_path deal with ".". +- hackweek-11-14-setup-fix-link-creation.patch: setup: Fix link + creation. + +------------------------------------------------------------------- New: ---- dont-substitute-release.patch hackweek-11-13-setup-let-normalize_path-deal-with-dot.patch hackweek-11-14-setup-fix-link-creation.patch quilt-el-fix-patch-select-completion.patch quilt-el-fix-tramp-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quilt.spec ++++++ --- /var/tmp/diff_new_pack.xwaSUT/_old 2015-01-30 23:57:33.000000000 +0100 +++ /var/tmp/diff_new_pack.xwaSUT/_new 2015-01-30 23:57:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package quilt # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -52,6 +52,9 @@ Patch11: inspect-skip-version-check.patch Patch12: quilt-check-modified-series.patch Patch13: quilt-check-modified-series-rearm.patch +Patch14: quilt-el-fix-tramp-support.patch +Patch15: quilt-el-fix-patch-select-completion.patch +Patch16: dont-substitute-release.patch Patch61: hackweek-11-01-comment-update.patch Patch62: hackweek-11-02-cleanups.patch Patch63: hackweek-11-03-inspect-list-all-options.patch @@ -64,6 +67,8 @@ Patch70: hackweek-11-10-setup-fix-path-to-extra-patches.patch Patch71: hackweek-11-11-setup-trace-call-first.patch Patch72: hackweek-11-12-setup-alternative-implementation-v2.patch +Patch73: hackweek-11-13-setup-let-normalize_path-deal-with-dot.patch +Patch74: hackweek-11-14-setup-fix-link-creation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %if 0%{?suse_version} @@ -98,6 +103,9 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 %patch61 -p1 %patch62 -p1 %patch63 -p1 @@ -110,6 +118,8 @@ %patch70 -p1 %patch71 -p1 %patch72 -p1 +%patch73 -p1 +%patch74 -p1 %build # --with-rpmbuild=/usr/lib/rpm/rpmb: @@ -127,7 +137,7 @@ --with-patch-wrapper \ --with-patch=/usr/bin/patch \ --with-rpmbuild=/usr/lib/rpm/rpmb -make %{?_smp_mflags} RELEASE=%{release} +make %{?_smp_mflags} # Compile quilt.el for faster emacs startup (bnc#617673) pushd lib emacs -batch -q --no-site -f batch-byte-compile quilt.el ++++++ dont-substitute-release.patch ++++++ From: Jean Delvare <jdelvare@suse.de> Subject: mail: Don't include the release number in User-Agent Upstream: Submitted (2015-01-26) @RELEASE@ is replaced with the package-level release number in two places: the spec file, where it is legitimate, and the mail command's User-Agent string, where I think it is not. The package release number should not affect the contents of the package, otherwise it makes it difficult to compare build results. I have checked other MUA (Mutt, Thunderbird, Claws Mail) and they all only include the version, not the release number in their User-Agent string. Drop the @RELEASE@ replacement rule to make sure we don't use it accidentally anywhere in the future. The spec file has its own build rule so it is not affected. --- Makefile.in | 1 - quilt/mail.in | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) --- a/Makefile.in +++ b/Makefile.in @@ -264,7 +264,6 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu -e 's:@PATCH''@:$(PATCH):g' \ -e 's:@STAT_HARDLINK''@:$(STAT_HARDLINK):g' \ -e 's:@VERSION''@:$(VERSION):g' \ - -e 's:@RELEASE''@:$(RELEASE):g' \ -e 's:@ETCDIR''@:$(etcdir):g' \ -e 's:@LOCALEDIR''@:$(localedir):g' \ -e 's:@DOCSUBDIR''@:$(docdir):g' \ --- a/quilt/mail.in +++ b/quilt/mail.in @@ -495,7 +495,7 @@ introduction="$(gen_tempfile)" ( cat <<-EOF Message-Id: <$(msgid)> - User-Agent: quilt/@VERSION@-@RELEASE@ + User-Agent: quilt/@VERSION@ Date: $(date --rfc-822) From: ${opt_from:-$opt_sender} To: $(IFS=,; echo "${opt_to[*]}") ++++++ hackweek-11-11-setup-trace-call-first.patch ++++++ --- /var/tmp/diff_new_pack.xwaSUT/_old 2015-01-30 23:57:33.000000000 +0100 +++ /var/tmp/diff_new_pack.xwaSUT/_new 2015-01-30 23:57:33.000000000 +0100 @@ -1,6 +1,6 @@ From: Jean Delvare <jdelvare@suse.de> Subject: inspect-wrapper: Trace calls earlier -Upstream: Submitted (2014-12-07) +Upstream: Committed (d56b11e711533b0adae8b0fd6b36ec01807d62b1) Trace the calls to the patch/tar/unzip wrapper earlier. That way, if anything goes wrong, we know which type of file was being processed. ++++++ hackweek-11-12-setup-alternative-implementation-v2.patch ++++++ --- /var/tmp/diff_new_pack.xwaSUT/_old 2015-01-30 23:57:33.000000000 +0100 +++ /var/tmp/diff_new_pack.xwaSUT/_new 2015-01-30 23:57:33.000000000 +0100 @@ -1,6 +1,6 @@ From: Jean Delvare <jdelvare@suse.de> Subject: setup: Add --fast option -Upstream: Submitted (2014-12-07) +Upstream: Committed (c0f677497b760028ae8aafb72d4d08604aa7870e) This is an alternative implementation of "quilt setup" for rpm spec files, which is much faster than the original implementation. The ++++++ hackweek-11-13-setup-let-normalize_path-deal-with-dot.patch ++++++ From: Jean Delvare <jdelvare@suse.de> Date: Tue, 20 Jan 2015 20:54:54 +0100 Subject: setup: Let normalize_path deal with "." Upstream: Committed (3fd706a50b7dbb4f8db6e5db014729db51e6beb0) Let function normalize_path handle "." path components. Otherwise invocations like "quilt setup --sourcedir=. foo.spec" may produce invalid series files, and "quilt setup -d ./dir foo.spec" generates a broken "patches" link. diff --git a/quilt/setup.in b/quilt/setup.in index df76368..7f69f35 100644 --- a/quilt/setup.in +++ b/quilt/setup.in @@ -71,10 +71,11 @@ check_for_existing_files() return $status } -# Resolve ".." in path and clean up double slashes +# Resolve ".." in path and clean up double slashes and "." normalize_path() { echo "$1" | sed -r -e 's://:/:g' \ + -e 's:/./:/:g' \ -e ':again' \ -e 's:/[^/]+/\.\.(/|$):\1:g' \ -e 'tagain' ++++++ hackweek-11-14-setup-fix-link-creation.patch ++++++ From: Jean Delvare <jdelvare@suse.de> Date: Sat, 24 Jan 2015 21:32:04 +0100 Subject: setup: Fix link creation Upstream: Committed (c55c1993ffee5d137ff40fcab0f59520ddcb00bf) Fix funtion create_symlink. If the link has an absolute path then its target should be set to an absolute path as well. This fixes the use of "quilt setup" with an absolute -d path and a relative --sourcedir path. diff --git a/quilt/setup.in b/quilt/setup.in index 7f69f35..ddb1f00 100644 --- a/quilt/setup.in +++ b/quilt/setup.in @@ -86,6 +86,7 @@ create_symlink() local target=$1 link=$2 up if [ "${target:0:1}" = / -o "${link:0:1}" = / ] then + [ "${target:0:1}" = / ] || target=$PWD/$target ln -s "$target" "$link" return fi ++++++ pop-add-auto-refresh.patch ++++++ --- /var/tmp/diff_new_pack.xwaSUT/_old 2015-01-30 23:57:34.000000000 +0100 +++ /var/tmp/diff_new_pack.xwaSUT/_new 2015-01-30 23:57:34.000000000 +0100 @@ -1,6 +1,6 @@ From: Jean Delvare <jdelvare@suse.de> Subject: pop: Add --refresh option -Upstream: Submitted (2014-10-01) +Upstream: Committed (7189482be1393c7b9e6170410d820f1867e8ec93) Add an option to automatically refresh each patch before it gets unapplied. ++++++ push-add-auto-refresh.patch ++++++ --- /var/tmp/diff_new_pack.xwaSUT/_old 2015-01-30 23:57:34.000000000 +0100 +++ /var/tmp/diff_new_pack.xwaSUT/_new 2015-01-30 23:57:34.000000000 +0100 @@ -1,6 +1,6 @@ From: Jean Delvare <jdelvare@suse.de> Subject: push: Add --refresh option -Upstream: Submitted (2014-10-01) +Upstream: Committed (a6987289e594d5bf0492fce7067723bc2ceb2cfc) Add an option to automatically refresh each patch after is was successfully applied. ++++++ quilt-el-fix-patch-select-completion.patch ++++++ From: Leonid Movshovich <event.riga@gmail.com> Date: Sun, 18 Jan 2015 10:04:56 +0100 Subject: quilt-el: Fix patch select completion Upstream: Committed (88decf920d2741ab4411f75827ce72beb0dc6995) A typo in quilt-patch-list prevents patch select completion operation. Reviewed and tested by Satoru Takeuchi. diff --git a/lib/quilt.el b/lib/quilt.el index 0a57b05..be359e5 100644 --- a/lib/quilt.el +++ b/lib/quilt.el @@ -126,7 +126,7 @@ (defun quilt-patch-list () "Return the list of the name of patches." - (quilt-cmd-to-list "seriess")) + (quilt-cmd-to-list "series")) (defun quilt-files-affected (&optional first last) "Return the file names which modified from FIRST to LAST." ++++++ quilt-el-fix-tramp-support.patch ++++++ From: Leonid Movshovich <event.riga@gmail.com> Date: Sun, 18 Jan 2015 10:04:52 +0100 Subject: quilt-el: Fix tramp support Upstream: Committed (7be8f49a95a528e4c46df0cfe26877457c95ac0e) quilt-find-dir goes to endless recursion if root is not '/'. This holds for files opened with tramp for example. Reviewed and tested by Satoru Takeuchi. diff --git a/lib/quilt.el b/lib/quilt.el index 6fe1c32..0a57b05 100644 --- a/lib/quilt.el +++ b/lib/quilt.el @@ -45,14 +45,14 @@ (or (getenv "QUILT_PATCHES") "patches"))) -(defun quilt-find-dir (fn) +(defun quilt-find-dir (fn &optional prefn) "Return the top level dir of quilt from FN." - (if (or (not fn) (equal fn "/")) + (if (or (not fn) (equal fn "/") (equal fn prefn)) nil (let ((d (file-name-directory fn))) (if (file-accessible-directory-p (concat d "/.pc")) d - (quilt-find-dir (directory-file-name d)))))) + (quilt-find-dir (directory-file-name d) d))))) (defun quilt-dir (&optional fn) "Return the top level dir of quilt from FN. FN is just a hint and find from other way if FN is nil." ++++++ quilt-format-options-pass-through.patch ++++++ --- /var/tmp/diff_new_pack.xwaSUT/_old 2015-01-30 23:57:34.000000000 +0100 +++ /var/tmp/diff_new_pack.xwaSUT/_new 2015-01-30 23:57:34.000000000 +0100 @@ -1,6 +1,6 @@ From: Jean Delvare <jdelvare@suse.de> Subject: Allow patch format options to pass through -Upstream: Submitted (2014-10-01) +Upstream: Committed (5fd023e14932bd01dbd5cbd6636a7ea5531c5d40) In order to make "quilt_command refresh" work properly, we must ensure that format options are passed through. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org