rpms/libfm/devel .cvsignore, 1.6, 1.7 libfm.spec, 1.13, 1.14 sources, 1.6, 1.7 libfm-0.1.11-gterm-argc.patch, 1.2, NONE libfm-0.1.11-path-removal-sanity-check.patch, 1.2, NONE libfm-0.1.11-sort-by-name-in-japanese.patch, 1.1, NONE

[Mamoru Tasaka]

Author: mtasaka

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

Modified Files:
	.cvsignore libfm.spec sources 
Removed Files:
	libfm-0.1.11-gterm-argc.patch 
	libfm-0.1.11-path-removal-sanity-check.patch 
	libfm-0.1.11-sort-by-name-in-japanese.patch 
Log Message:
libfm 0.1.12 pcmanfm 0.9.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	25 May 2010 14:32:10 -0000	1.6
+++ .cvsignore	29 May 2010 11:12:03 -0000	1.7
@@ -1,2 +1 @@
-libfm-0.1.11.tar.gz
-libfm-po-files.tar.gz
+libfm-0.1.12.tar.gz


Index: libfm.spec
===================================================================
RCS file: /cvs/extras/rpms/libfm/devel/libfm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- libfm.spec	29 May 2010 06:18:53 -0000	1.13
+++ libfm.spec	29 May 2010 11:12:03 -0000	1.14
@@ -4,27 +4,17 @@
 # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/libfm
 
 Name:           libfm
-Version:        0.1.11
-Release:        7%{?dist}
+Version:        0.1.12
+Release:        1%{?dist}
 Summary:        GIO-based library for file manager-like programs
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://pcmanfm.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz
-# Translation update, all from git
-# 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
 # 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
-# gnome-terminal wrapper crashes with certain path setting
-# upstream bug 3008676
-Patch4:         libfm-0.1.11-path-removal-sanity-check.patch
 # Patches need discussing with the upstream
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -86,15 +76,9 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -a 1
+%setup -q
 
 %patch0 -p1 -b .orig
-%patch2 -p1 -b .gterm_segv
-%patch3 -p1 -b .sort_in_jp
-%patch4 -p1 -b .gterm_path
-
-# translation update
-cp -p libfm-po-files/*.po po/
 
 # treak rpath
 sed -i.libdir_syssearch -e \
@@ -201,6 +185,9 @@ update-mime-database %{_datadir}/mime &>
 
 
 %changelog
+* Sat May 29 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.12-1
+- Update to 0.1.12, drop upstreamed patches
+
 * Sat May 29 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.11-7
 - Fix crash of gnome-terminal wrapper with certain path settings
   (bug 596598, 597270)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfm/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	25 May 2010 14:32:11 -0000	1.6
+++ sources	29 May 2010 11:12:03 -0000	1.7
@@ -1,2 +1 @@
-65cf42729c0f3fc3c8c1ed03f78ce9fb  libfm-0.1.11.tar.gz
-9577328921accdfa58444e100127f129  libfm-po-files.tar.gz
+6dbc9a30efb5ad0a2c7a0fc54b1ee57c  libfm-0.1.12.tar.gz


--- libfm-0.1.11-gterm-argc.patch DELETED ---


--- libfm-0.1.11-path-removal-sanity-check.patch DELETED ---


--- libfm-0.1.11-sort-by-name-in-japanese.patch DELETED ---