- 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.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=94

hackweek-11-11-setup-trace-call-first.patch

@@ -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

@@ -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

@@ -0,0 +1,27 @@
+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

@@ -0,0 +1,22 @@
+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

@@ -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

@@ -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

@@ -0,0 +1,22 @@
+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

@@ -0,0 +1,32 @@
+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

@@ -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.

quilt.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+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.
+
 -------------------------------------------------------------------
 Mon Dec  8 10:39:42 CET 2014 - jdelvare@suse.de
 

quilt.spec

@@ -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,8 @@ Patch10:        push-add-auto-refresh.patch
 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
 Patch61:        hackweek-11-01-comment-update.patch
 Patch62:        hackweek-11-02-cleanups.patch
 Patch63:        hackweek-11-03-inspect-list-all-options.patch
@@ -64,6 +66,8 @@ Patch69:        hackweek-11-09-inspect-temporary-data-file.patch
 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 +102,8 @@ http://www.zip.com.au/~akpm/linux/patches/.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
 %patch61 -p1
 %patch62 -p1
 %patch63 -p1
@@ -110,6 +116,8 @@ http://www.zip.com.au/~akpm/linux/patches/.
 %patch70 -p1
 %patch71 -p1
 %patch72 -p1
+%patch73 -p1
+%patch74 -p1
 
 %build
 # --with-rpmbuild=/usr/lib/rpm/rpmb: