rpms/libfm/devel libfm-0.1.11-sort-by-name-in-japanese.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 libfm-0.1.11-gterm-argc.patch, 1.1, 1.2 libfm.spec, 1.10, 1.11 sources, 1.5, 1.6

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	.cvsignore libfm-0.1.11-gterm-argc.patch libfm.spec sources 
Added Files:
	libfm-0.1.11-sort-by-name-in-japanese.patch 
Log Message:
* Tue May 25 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-5
- Translation update from git
- Fix an issue in sorting by name in ja_JP.UTF-8 (upstream bug 3002788)


libfm-0.1.11-sort-by-name-in-japanese.patch:
 fm-file-info.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE libfm-0.1.11-sort-by-name-in-japanese.patch ---
commit 08a0961156453a10c1093bc828ddd4586d4c613b
Author: Hong Jen Yee (PCMan) <pcman.tw at gmail.com>
Date:   Tue May 25 01:24:43 2010 +0800

    Fix #3002788 - Incorrect sort order in ja_JP.UTF-8.
    Thanks Mamoru Tasaka for the patch.

diff --git a/src/base/fm-file-info.c b/src/base/fm-file-info.c
index 913a4de..183fd4b 100644
--- a/src/base/fm-file-info.c
+++ b/src/base/fm-file-info.c
@@ -453,11 +453,16 @@ const char* fm_file_info_get_collate_key( FmFileInfo* fi )
 {
     if( G_UNLIKELY(!fi->collate_key) )
     {
-        char* collate = g_utf8_collate_key_for_filename(fi->disp_name, -1);
+        char* casefold = g_utf8_casefold(fi->disp_name, -1);
+        char* collate = g_utf8_collate_key_for_filename(casefold, -1);
+        g_free(casefold);
         if( strcmp(collate, fi->disp_name) )
             fi->collate_key = collate;
         else
+        {
             fi->collate_key = fi->disp_name;
+            g_free(collate);
+        }
     }
     return fi->collate_key;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	11 May 2010 19:37:49 -0000	1.5
+++ .cvsignore	25 May 2010 14:32:10 -0000	1.6
@@ -1,2 +1,2 @@
 libfm-0.1.11.tar.gz
-libfm-0.1.11-translation-update-patches.tar.gz
+libfm-po-files.tar.gz

libfm-0.1.11-gterm-argc.patch:
 gnome-terminal-wrapper.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: libfm-0.1.11-gterm-argc.patch
===================================================================
RCS file: /cvs/extras/rpms/libfm/devel/libfm-0.1.11-gterm-argc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libfm-0.1.11-gterm-argc.patch	7 May 2010 08:21:35 -0000	1.1
+++ libfm-0.1.11-gterm-argc.patch	25 May 2010 14:32:10 -0000	1.2
@@ -1,6 +1,15 @@
---- libfm-0.1.11/src/gnome-terminal-wrapper.c.debug	2010-04-25 01:00:24.000000000 +0900
-+++ libfm-0.1.11/src/gnome-terminal-wrapper.c	2010-05-07 16:58:20.000000000 +0900
-@@ -82,7 +82,7 @@
+commit 3dc7f4f88bef5937abc7646efb46579821596402
+Author: Hong Jen Yee (PCMan) <pcman.tw at gmail.com>
+Date:   Sat May 15 17:27:54 2010 +0800
+
+    Fix #2998427: gnome-terminal wrapper can crash without libfm.conf.
+    Apply patch from Fedora.
+
+diff --git a/src/gnome-terminal-wrapper.c b/src/gnome-terminal-wrapper.c
+index a7f3f2e..44134bb 100644
+--- a/src/gnome-terminal-wrapper.c
++++ b/src/gnome-terminal-wrapper.c
+@@ -82,7 +82,7 @@ int main(int argc, char** argv)
      path = sep + 1;
      g_setenv("PATH", path, TRUE);
  
@@ -9,7 +18,7 @@
      {
          sep = strchr(terminal, ' ');
          if(sep)
-@@ -90,7 +90,7 @@
+@@ -90,7 +90,7 @@ int main(int argc, char** argv)
          argv[0] = terminal;
      }
  


Index: libfm.spec
===================================================================
RCS file: /cvs/extras/rpms/libfm/devel/libfm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- libfm.spec	11 May 2010 19:49:31 -0000	1.10
+++ libfm.spec	25 May 2010 14:32:10 -0000	1.11
@@ -5,7 +5,7 @@
 
 Name:           libfm
 Version:        0.1.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GIO-based library for file manager-like programs
 
 Group:          System Environment/Libraries
@@ -13,10 +13,15 @@ License:        GPLv2+
 URL:            http://pcmanfm.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz
 # Translation update, all from git
-Source1:        libfm-0.1.11-translation-update-patches.tar.gz
+# Drop Source1 when next stable version is released
+Source1:        libfm-po-files.tar.gz
+# Fedora specific patches
 Patch0:         libfm-0.1.9-pref-apps.patch
-# Patch for 589730
+# Patches already in git
+# Patch for bug 589730, upstream bug 2998427
 Patch2:         libfm-0.1.11-gterm-argc.patch
+# Issue in sorting by name in ja_JP.UTF-8, upstream bug 3002788
+Patch3:         libfm-0.1.11-sort-by-name-in-japanese.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.16.0
@@ -81,11 +86,10 @@ developing applications that use %{name}
 
 %patch0 -p1 -b .orig
 %patch2 -p1 -b .gterm_segv
+%patch3 -p1 -b .sort_in_jp
+
 # translation update
-for f in libfm-patches/*patch
-do
-  cat $f | patch -p1 -s
-done
+cp -p libfm-po-files/*.po po/
 
 # treak rpath
 sed -i.libdir_syssearch -e \
@@ -192,6 +196,10 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Tue May 25 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-5
+- Translation update from git
+- Fix an issue in sorting by name in ja_JP.UTF-8 (upstream bug 3002788)
+
 * Sun May  9 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-4
 - Translation update from git
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	11 May 2010 19:37:49 -0000	1.5
+++ sources	25 May 2010 14:32:11 -0000	1.6
@@ -1,2 +1,2 @@
 65cf42729c0f3fc3c8c1ed03f78ce9fb  libfm-0.1.11.tar.gz
-afc1d194b90fc8b1357eb8df265e76c6  libfm-0.1.11-translation-update-patches.tar.gz
+9577328921accdfa58444e100127f129  libfm-po-files.tar.gz