rpms/subcommander/F-11 subcommander-2.0.0b5p1-dso.patch, NONE, 1.1 subcommander-2.0.0b5p1-upd.patch, NONE, 1.1 sources, 1.5, 1.6 subcommander.spec, 1.25, 1.26 subcommander-2.0.0b4-gcc43.patch, 1.1, NONE subcommander-2.0.0b4-gcc44.patch, 1.1, NONE subcommander-2.0.0b4-gui.patch, 1.1, NONE subcommander-2.0.0b4-svn15.patch, 1.1, NONE subcommander-svn-1.6-build.patch, 1.1, NONE

Thu Mar 18 18:07:15 UTC 2010

Author: s4504kr

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

Modified Files:
	sources subcommander.spec 
Added Files:
	subcommander-2.0.0b5p1-dso.patch 
	subcommander-2.0.0b5p1-upd.patch 
Removed Files:
	subcommander-2.0.0b4-gcc43.patch 
	subcommander-2.0.0b4-gcc44.patch 
	subcommander-2.0.0b4-gui.patch 
	subcommander-2.0.0b4-svn15.patch 
	subcommander-svn-1.6-build.patch 
Log Message:
New upstream release

subcommander-2.0.0b5p1-dso.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE subcommander-2.0.0b5p1-dso.patch ---
diff -up subcommander-2.0.0b5/subcommander/Makefile.am.dso subcommander-2.0.0b5/subcommander/Makefile.am
--- subcommander-2.0.0b5/subcommander/Makefile.am.dso	2010-03-17 20:56:29.838693615 +0100
+++ subcommander-2.0.0b5/subcommander/Makefile.am	2010-03-17 20:57:18.819568844 +0100
@@ -127,7 +127,7 @@ bin_PROGRAMS   = subcommander
 
 subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib \
                      @QT_LIBS@ @SVN_LIBS_ALL@ @STLPORT_LIBS@ @NET_LIBS@ \
-                     @APU_LIBS@ @APR_LIBS@ -lsasl2 -lz
+                     @APU_LIBS@ @APR_LIBS@ -lsasl2 -lz -lneon
 
 subcommander_DEPENDENCIES = ../sublib/libsublib.a ../svn/libsvn.a ../util/libutil.a
 

subcommander-2.0.0b5p1-upd.patch:
 Project.cpp |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE subcommander-2.0.0b5p1-upd.patch ---
diff -up subcommander-2.0.0b5/subcommander/Project.cpp.ux subcommander-2.0.0b5/subcommander/Project.cpp
--- subcommander-2.0.0b5/subcommander/Project.cpp.ux	2009-01-04 10:52:02.000000000 +0100
+++ subcommander-2.0.0b5/subcommander/Project.cpp	2010-03-17 19:17:10.706569071 +0100
@@ -594,12 +594,14 @@ void Project::Item::setSource( const sc:
 
   // make sure all wc paths use '/' and not '\' as path seperator. 
 
+  QString path = QString::fromUtf8(newSrc);
+
   if( isWorkingCopy() )
-  {
-    QString path = QString::fromUtf8(newSrc);
-    path.replace( '\\', '/' );
-    newSrc = sc::String(path.utf8());
-  }
+    path = path.replace( '\\', '/' );
+
+  path = path.replace(":////", "://");
+
+  newSrc = sc::String(path.utf8());
 
   // svn delivers path without trailing "/". Make sure we also have
   // the path without "/". Otherwise a string compare on an equal path


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/subcommander/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 Nov 2008 19:43:09 -0000	1.5
+++ sources	18 Mar 2010 18:07:13 -0000	1.6
@@ -1 +1 @@
-9c19a695b7c632269f32da82a009fef2  Subcommander-2.0.0b4.tar.gz
+6aa8d1889dd849cbec717546478cd285  Subcommander-2.0.0b5p1.tar.gz


Index: subcommander.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subcommander/F-11/subcommander.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- subcommander.spec	13 May 2009 20:19:37 -0000	1.25
+++ subcommander.spec	18 Mar 2010 18:07:15 -0000	1.26
@@ -1,23 +1,22 @@
-%define subvers 2.0.0b4
+%define subvers 2.0.0b5p1
 
 Name:		subcommander
-Version:	1.9.94
-Release:	7%{?dist}.1
+Version:	2.0
+Release:	0.6%{?dist}.3
 Summary:	Graphical UI for subversion
 
 Group:		Development/Tools
 License:	GPLv2+
 URL:		http://subcommander.tigris.org	
-Source0:	http://subcommander.tigris.org/files/documents/1759/43367/Subcommander-2.0.0b4.tar.gz
+Source0:	http://subcommander.tigris.org/files/documents/1759/46766/Subcommander-%{subvers}.tar.gz
 Source1:	subcommander.desktop
 Source2:	submerge.desktop
-Patch1:		subcommander-2.0.0b4-gcc43.patch
-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
+Patch1:		subcommander-2.0.0b4-var.patch
+
+# Sent to upstream via project mailing list
+Patch2:		subcommander-2.0.0b5p1-upd.patch
+Patch3:		subcommander-2.0.0b5p1-dso.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  automake
@@ -40,13 +39,10 @@ The Subversion gui client is called subc
 is called submerge.
 
 %prep
-%setup -q -n %{name}-%{subvers}
-%patch1 -p1 -b .gcc43
-%patch2 -p1 -b .var
-%patch3 -p1 -b .gui
-%patch4 -p1 -b .svn
-%patch5 -p1 -b .gcc44
-%patch6 -p0 -b .svn16
+%setup -q -n %{name}-2.0.0b5
+# %patch1 -p1 -b .var
+%patch2 -p1 -b .ux
+%patch3 -p1 -b .dso
 
 %build
 aclocal
@@ -87,13 +83,31 @@ rm -rf $RPM_BUILD_ROOT
 %doc README CHANGES COPYING
 
 %changelog
-* Wed May 13 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.9.94-7.1
+* Wed Mar 17 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.0-0.6.3
+- Remove unused GUI patch
+
+* Wed Mar 17 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.0-0.6.2
+- Path to fix BZ #571280
+- Patch cleanup
+- Disable GUI patch
+
+* Tue Mar 16 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.0-0.6.1
+- New updatream release 2.0.0b5p1
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 2.0-0.5.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.0-0.4.1
+- Change versioning for beta releases
+- Rebuild for new boost release
+
+* 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)
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.94-5
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1.9.94-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Feb  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.9.94-4


--- subcommander-2.0.0b4-gcc43.patch DELETED ---


--- subcommander-2.0.0b4-gcc44.patch DELETED ---


--- subcommander-2.0.0b4-gui.patch DELETED ---


--- subcommander-2.0.0b4-svn15.patch DELETED ---


--- subcommander-svn-1.6-build.patch DELETED ---

