rpms/subcommander/F-12 subcommander-2.0.0b5p1-upd.patch, 1.1, 1.2 subcommander.spec, 1.27, 1.28
Jochen Schmitt
s4504kr at fedoraproject.org
Thu Apr 15 15:44:02 UTC 2010
Author: s4504kr
Update of /cvs/pkgs/rpms/subcommander/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8560
Modified Files:
subcommander-2.0.0b5p1-upd.patch subcommander.spec
Log Message:
Try to fix BZ #572180
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/F-12/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 18 Mar 2010 17:49:56 -0000 1.1
+++ subcommander-2.0.0b5p1-upd.patch 15 Apr 2010 15:44:02 -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/F-12/subcommander.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- subcommander.spec 18 Mar 2010 17:49:56 -0000 1.27
+++ subcommander.spec 15 Apr 2010 15:44:02 -0000 1.28
@@ -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
More information about the scm-commits
mailing list