rpms/diffuse/F-11 diffuse-0.3.3-cvsrel.patch, NONE, 1.1 diffuse.spec, 1.2, 1.3 sources, 1.3, 1.4

[Jon Levell]

Author: jonquark

Update of /cvs/pkgs/rpms/diffuse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16205

Modified Files:
	diffuse.spec sources 
Added Files:
	diffuse-0.3.3-cvsrel.patch 
Log Message:
Update to diffuse 0.3.3


diffuse-0.3.3-cvsrel.patch:

--- NEW FILE diffuse-0.3.3-cvsrel.patch ---
--- broken/src/usr/bin/diffuse    (revision 129)
+++ fixed/src/usr/bin/diffuse    (working copy)
@@ -1296,7 +1296,7 @@
                 if len(s) > 2 and s[0] in 'ACMR':
                     k = os.path.join(self.root, prefs.convertToNativePath(s[2:]))
                     if not isabs:
-                        k = replpath(pwd, k)
+                        k = relpath(pwd, k)
                     r[k] = s[0]
             for k in sorted(r.keys()):
                 v = r[k]


Index: diffuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/diffuse/F-11/diffuse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- diffuse.spec	10 Mar 2009 21:47:46 -0000	1.2
+++ diffuse.spec	30 Jun 2009 18:31:43 -0000	1.3
@@ -1,5 +1,5 @@
 Name: diffuse
-Version: 0.3.1
+Version: 0.3.3
 Release: 1%{?dist}
 Summary: Graphical tool for comparing and merging text files
 
@@ -7,6 +7,7 @@ Group: Development/Tools
 License: GPLv2+
 URL: http://%{name}.sourceforge.net/
 Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Patch0: diffuse-0.3.3-cvsrel.patch
 
 BuildRequires: desktop-file-utils, scrollkeeper
 Requires: python >= 2.4, pygtk2 >= 2.10
@@ -25,6 +26,7 @@ Monotone, Subversion, and SVK repositori
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -61,10 +63,14 @@ update-desktop-database &> /dev/null || 
 %dir %{_datadir}/gnome/help/diffuse/C
 %dir %{_datadir}/omf/diffuse
 
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README
 
 %changelog
 
+* Tue Jun 30 2009 Jon Levell <fedora at coralbark.net> - 0.3.3-1
+- Update to latest upstream release
+- Add patch provided by upstream 
+
 * Tue Mar 10 2009 Jon Levell <fedora at coralbark.net> - 0.3.1-1
 - Update to latest upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/diffuse/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	10 Mar 2009 21:47:46 -0000	1.3
+++ sources	30 Jun 2009 18:31:43 -0000	1.4
@@ -1 +1 @@
-b590426677579fe1be761a1bb6678578  diffuse-0.3.1.tar.bz2
+4c483b557d270024704120adc2552c2c  diffuse-0.3.3.tar.bz2