rpms/subcommander/devel subcommander-svn-1.6-build.patch, NONE, 1.1 subcommander.spec, 1.23, 1.24

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/subcommander/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12685

Modified Files:
	subcommander.spec 
Added Files:
	subcommander-svn-1.6-build.patch 
Log Message:
Add fix to build subcommander agains subversion-1.6.x

subcommander-svn-1.6-build.patch:

--- NEW FILE subcommander-svn-1.6-build.patch ---
Index: svn/CommitItem.cpp
===================================================================
--- svn/CommitItem.cpp	(revision 2373)
+++ svn/CommitItem.cpp	(working copy)
@@ -10,7 +10,10 @@
 // sc
 #include "CommitItem.h"
 
+// svn
+#include <svn_props.h>
 
+
 namespace svn
 {
 
Index: svn/Property.cpp
===================================================================
--- svn/Property.cpp	(revision 2373)
+++ svn/Property.cpp	(working copy)
@@ -11,7 +11,7 @@
 #include "Property.h"
 
 // svn
-#include <svn_client.h>
+#include <svn_props.h>
 
 
 namespace svn


Index: subcommander.spec
===================================================================
RCS file: /cvs/extras/rpms/subcommander/devel/subcommander.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- subcommander.spec	1 Mar 2009 20:02:21 -0000	1.23
+++ subcommander.spec	13 May 2009 19:58:08 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:		subcommander
 Version:	1.9.94
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Graphical UI for subversion
 
 Group:		Development/Tools
@@ -15,6 +15,7 @@ Patch1:		subcommander-2.0.0b4-gcc43.patc
 Patch2:		subcommander-2.0.0b4-var.patch
 Patch3:		subcommander-2.0.0b4-gui.patch
 Patch4:		subcommander-2.0.0b4-svn15.patch
+Patch6:		subcommander-svn-1.6-build.patch
 # Sent mail to upstream via mailing list
 Patch5:		subcommander-2.0.0b4-gcc44.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +46,7 @@ is called submerge.
 %patch3 -p1 -b .gui
 %patch4 -p1 -b .svn
 %patch5 -p1 -b .gcc44
+%patch6 -p0 -b .svn16
 
 %build
 aclocal
@@ -85,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README CHANGES COPYING
 
 %changelog
+* Wed May 13 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.9.94-7
+- Add fix to build subcommander agains subversion-1.6.x
+
 * Sun Mar  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.9.94-6
 - Fix desktop file (BZ #487869)