From b7827caee313d449ed7bd6a1922bc2c8508808c358a227a390d666d82eedd640 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 26 Mar 2007 23:46:52 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/quilt?expand=0&rev=3

---
 quilt.changes  |  5 +++++
 quilt.spec     |  6 ++++--
 refresh-z.diff | 30 +++++++++++++++---------------
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/quilt.changes b/quilt.changes
index c633655..b28f623 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 26 15:24:05 CEST 2007 - agruen@suse.de
+
+- Quilt refresh: fix existing patch check.
+
 -------------------------------------------------------------------
 Thu Feb 15 20:43:22 CET 2007 - olh@suse.de
 
diff --git a/quilt.spec b/quilt.spec
index ebda3d4..61a9f4f 100644
--- a/quilt.spec
+++ b/quilt.spec
@@ -16,7 +16,7 @@ Summary:        A Tool for Working with Many Patches
 License:        GNU General Public License (GPL)
 Group:          Productivity/Text/Utilities
 Version:        0.46
-Release:        20
+Release:        24
 Requires:       coreutils diffutils patch gzip bzip2 perl mktemp
 Autoreqprov:    off
 Source:         %{name}-%{version}.tar.bz2
@@ -98,7 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/README.MAIL
 %doc doc/quilt.pdf
 
-%changelog -n quilt
+%changelog
+* Mon Mar 26 2007 - agruen@suse.de
+- Quilt refresh: fix existing patch check.
 * Thu Feb 15 2007 - olh@suse.de
 - force mandir to fix build in sles10
 * Thu Oct 19 2006 - agruen@suse.de
diff --git a/refresh-z.diff b/refresh-z.diff
index 58390e4..665fdb9 100644
--- a/refresh-z.diff
+++ b/refresh-z.diff
@@ -1,7 +1,7 @@
-Index: quilt/quilt/diff.in
+Index: quilt-0.46/quilt/diff.in
 ===================================================================
---- quilt.orig/quilt/diff.in
-+++ quilt/quilt/diff.in
+--- quilt-0.46.orig/quilt/diff.in
++++ quilt-0.46/quilt/diff.in
 @@ -80,7 +80,8 @@ included.
  }
  
@@ -57,10 +57,10 @@ Index: quilt/quilt/diff.in
  fi
  
  for file in "${files[@]}"
-Index: quilt/quilt/fork.in
+Index: quilt-0.46/quilt/fork.in
 ===================================================================
---- quilt.orig/quilt/fork.in
-+++ quilt/quilt/fork.in
+--- quilt-0.46.orig/quilt/fork.in
++++ quilt-0.46/quilt/fork.in
 @@ -72,11 +72,7 @@ if [ $# -eq 1 ]
  then
  	new_patch="$1"
@@ -74,10 +74,10 @@ Index: quilt/quilt/fork.in
  fi
  
  new_patch=${new_patch#$QUILT_PATCHES/}
-Index: quilt/quilt/refresh.in
+Index: quilt-0.46/quilt/refresh.in
 ===================================================================
---- quilt.orig/quilt/refresh.in
-+++ quilt/quilt/refresh.in
+--- quilt-0.46.orig/quilt/refresh.in
++++ quilt-0.46/quilt/refresh.in
 @@ -19,7 +19,7 @@ fi
  
  usage()
@@ -155,7 +155,7 @@ Index: quilt/quilt/refresh.in
 +	else
 +		patch=$(next_filename "$patch")
 +	fi
-+	if [ -e "$(patch_file_name "patch")" ]; then
++	if [ -e "$(patch_file_name "$patch")" ]; then
 +		printf $"Patch %s exists already\n" "$(print_patch $patch)" >&2
 +		exit 1
 +	fi
@@ -300,10 +300,10 @@ Index: quilt/quilt/refresh.in
  else
  	die 1
  fi
-Index: quilt/quilt/scripts/patchfns.in
+Index: quilt-0.46/quilt/scripts/patchfns.in
 ===================================================================
---- quilt.orig/quilt/scripts/patchfns.in
-+++ quilt/quilt/scripts/patchfns.in
+--- quilt-0.46.orig/quilt/scripts/patchfns.in
++++ quilt-0.46/quilt/scripts/patchfns.in
 @@ -838,6 +838,65 @@ first_modified_by()
  	return 1
  }
@@ -370,10 +370,10 @@ Index: quilt/quilt/scripts/patchfns.in
  create_db() {
  	if ! [ -e $QUILT_PC ]
  	then
-Index: quilt/test/refresh-z.test
+Index: quilt-0.46/test/refresh-z.test
 ===================================================================
 --- /dev/null
-+++ quilt/test/refresh-z.test
++++ quilt-0.46/test/refresh-z.test
 @@ -0,0 +1,29 @@
 +	$ rm -rf d
 +	$ mkdir -p d/patches