rpms/subcommander/devel subcommander-2.0.0b5p1-upd.patch, 1.1, 1.2 subcommander.spec, 1.31, 1.32

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/pkgs/rpms/subcommander/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7083

Modified Files:
	subcommander-2.0.0b5p1-upd.patch subcommander.spec 
Log Message:
Try to improve patch for BZ #57218ß

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

Index: subcommander-2.0.0b5p1-upd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/subcommander/devel/subcommander-2.0.0b5p1-upd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- subcommander-2.0.0b5p1-upd.patch	17 Mar 2010 19:28:08 -0000	1.1
+++ subcommander-2.0.0b5p1-upd.patch	13 Apr 2010 19:06:40 -0000	1.2
@@ -1,7 +1,7 @@
 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:
++++ subcommander-2.0.0b5/subcommander/Project.cpp	2010-04-13 20:53:58.644695720 +0200
+@@ -594,12 +594,22 @@ void Project::Item::setSource( const sc:
  
    // make sure all wc paths use '/' and not '\' as path seperator. 
  
@@ -17,6 +17,14 @@ diff -up subcommander-2.0.0b5/subcommand
 +
 +  path = path.replace(":////", "://");
 +
++  int l = path.findRev("//");
++
++  if (l > 0) 
++    {
++      if(path[l-1].latin1() != ':')
++	 path = path.remove(l,1);
++    }
++
 +  newSrc = sc::String(path.utf8());
  
    // svn delivers path without trailing "/". Make sure we also have


Index: subcommander.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subcommander/devel/subcommander.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- subcommander.spec	17 Mar 2010 21:31:03 -0000	1.31
+++ subcommander.spec	13 Apr 2010 19:06:40 -0000	1.32
@@ -2,7 +2,7 @@
 
 Name:		subcommander
 Version:	2.0
-Release:	0.6%{?dist}.3
+Release:	0.6%{?dist}.4
 Summary:	Graphical UI for subversion
 
 Group:		Development/Tools
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README CHANGES COPYING
 
 %changelog
+* Tue Apr 13 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.0-0.6.4
+- Improving patch for BZ #571280
+
 * Wed Mar 17 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.0-0.6.3
 - Remove unused GUI patch