[meld/f13/master] - Add patch to fix svn intergration. (#606987)

[Brian Pepple]

commit 7823d5778185ade9abe9f30a80401803f6278a05
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Sat Sep 11 11:56:45 2010 -0400

    - Add patch to fix svn intergration. (#606987)

 empty_cwd.patch |   12 ++++++++++++
 meld.spec       |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/empty_cwd.patch b/empty_cwd.patch
new file mode 100644
index 0000000..be2722f
--- /dev/null
+++ b/empty_cwd.patch
@@ -0,0 +1,12 @@
+diff -urp meld-1.3.1.OLD/misc.py meld-1.3.1/misc.py
+--- meld-1.3.1.OLD/misc.py	2009-08-14 01:01:33.000000000 -0400
++++ meld-1.3.1/misc.py	2010-09-11 11:49:44.113243001 -0400
+@@ -233,6 +233,8 @@ def read_pipe_iter(command, errorstream,
+             if status:
+                 errorstream.write("Exit code: %i\n" % status)
+             yield "".join(bits)
++    if workdir == "":
++        workdir = None
+     return sentinel()()
+ 
+ def write_pipe(command, text):
diff --git a/meld.spec b/meld.spec
index 1ef9d11..0799eb6 100644
--- a/meld.spec
+++ b/meld.spec
@@ -1,6 +1,6 @@
 Name:		meld
 Version:	1.3.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Visual diff and merge tool
 
 Group:		Development/Tools
@@ -8,6 +8,8 @@ License:	GPLv2+
 URL:		http://meld.sourceforge.net/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.3/%{name}-%{version}.tar.bz2
 Patch1:		%{name}-scrollkeeper.patch
+# Backport patch for Gnome Bug #597718
+Patch2:		empty_cwd.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -33,6 +35,7 @@ tabbed interface that allows you to open many diffs at once.
 %prep
 %setup -q
 %patch1 -p1 -b .scrollkeeper
+%patch2 -p1 -b .cwd
 
 
 %build
@@ -66,6 +69,9 @@ desktop-file-install --vendor fedora                    \
 
 
 %changelog
+* Sat Sep 11 2010 Brian Pepple <bpepple at fedoraproject.org> - 1.3.1-3
+- Add patch to fix svn intergration. (#606987)
+
 * Sun Apr 25 2010 Brian Pepple <bpepple at fedoraproject.org> - 1.3.1-2
 - Remove clean section. No longer needed.