rpms/libfm/devel libfm-0.1.12-filen-begin-with-slasla.patch, NONE, 1.1 libfm.spec, 1.15, 1.16

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/libfm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28802/devel

Modified Files:
	libfm.spec 
Added Files:
	libfm-0.1.12-filen-begin-with-slasla.patch 
Log Message:
* Thu Jun 10 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.12-3
- Fix an issue that pcmanfm // crashes (upstream bug 3012747)


libfm-0.1.12-filen-begin-with-slasla.patch:
 fm-path.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE libfm-0.1.12-filen-begin-with-slasla.patch ---
diff --git a/src/base/fm-path.c b/src/base/fm-path.c
index 937a9d7..bae49fc 100644
--- a/src/base/fm-path.c
+++ b/src/base/fm-path.c
@@ -51,8 +51,11 @@ FmPath* fm_path_new(const char* path)
 
     if( path[0] == '/' ) /* if this is a absolute native path */
     {
-        if (path[1])
-            return fm_path_new_relative(root, path + 1);
+        /* handle the case where path begins with // */
+        while (*path == '/') path++;
+
+        if (*path)
+            return fm_path_new_relative(root, path);
         else
             /* special case: handle root dir */
             return fm_path_ref( root );


Index: libfm.spec
===================================================================
RCS file: /cvs/extras/rpms/libfm/devel/libfm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- libfm.spec	3 Jun 2010 20:38:55 -0000	1.15
+++ libfm.spec	9 Jun 2010 17:53:38 -0000	1.16
@@ -5,7 +5,7 @@
 
 Name:           libfm
 Version:        0.1.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GIO-based library for file manager-like programs
 
 Group:          System Environment/Libraries
@@ -18,6 +18,8 @@ Patch0:         libfm-0.1.9-pref-apps.pa
 # Patches need discussing with the upstream
 # Upstream bug 3009374, sorting by name broken in cs_CZ.UTF-8
 Patch1:         libfm-0.1.12-sort-in-cs_CZ.UTF-8.patch
+# Upstream bug 3012747, pcmanfm // crashes
+Patch2:         libfm-0.1.12-filen-begin-with-slasla.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -82,6 +84,7 @@ developing applications that use %{name}
 
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .sort_cs
+%patch2 -p1 -b .slasla
 
 # treak rpath
 sed -i.libdir_syssearch -e \
@@ -188,7 +191,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
-* Thu Jun  4 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.12-2
+* Thu Jun 10 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.12-3
+- Fix an issue that pcmanfm // crashes (upstream bug 3012747)
+
+* Fri Jun  4 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.12-2
 - Fix an issue in sorting by name in cs_CZ.UTF-8 (upstream bug 3009374)
 
 * Sat May 29 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.12-1