[libfm/f14/master] - Update to 0.1.14, drop patches

[Mamoru Tasaka]

commit 11d719cdecd37e67eccb798fc886852c7aff661c
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Wed Oct 13 06:51:16 2010 +0900

    - Update to 0.1.14, drop patches

 .gitignore                                         |    1 +
 ...crash-on-click-on-volume-entry-on-desktop-patch |   35 ---------------
 libfm-0.1.12-filen-begin-with-slasla.patch         |   18 --------
 libfm-0.1.12-sort-in-cs_CZ.UTF-8.patch             |   18 --------
 libfm.spec                                         |   46 ++++++++++++-------
 sources                                            |    2 +-
 6 files changed, 31 insertions(+), 89 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 664aa67..31ce336 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libfm-0.1.12.tar.gz
+/libfm-0.1.14.tar.gz
diff --git a/libfm.spec b/libfm.spec
index 84c29c1..0efa129 100644
--- a/libfm.spec
+++ b/libfm.spec
@@ -4,8 +4,8 @@
 # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/libfm
 
 Name:           libfm
-Version:        0.1.12
-Release:        4%{?dist}
+Version:        0.1.14
+Release:        1%{?dist}
 Summary:        GIO-based library for file manager-like programs
 
 Group:          System Environment/Libraries
@@ -14,21 +14,18 @@ URL:            http://pcmanfm.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz
 # Fedora specific patches
 Patch0:         libfm-0.1.9-pref-apps.patch
-# Patches already in git
-#
-# 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
-# Fedora bug 607069, pcmanfm --desktop crashes when clicking volume icon
-Patch3:         libfm-0.1.12-crash-on-click-on-volume-entry-on-desktop-patch
+# Need contact with upstream
+Patch1:         libfm-0.1.14-dso-linkage.patch
 
 BuildRequires:  gtk2-devel >= 2.16.0
 BuildRequires:  menu-cache-devel >= 0.3.2
 BuildRequires:  gettext
 BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
+# For Patch1
+BuildRequires:  automake
+BuildRequires:  libtool
+BuildRequires:  gtk-doc
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -80,14 +77,20 @@ Requires:       %{name}-devel = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}-gtk.
 
+%package        devel-docs
+Summary:        Development documation for %{name}
+Group:          Development/Libraries
+
+%description    devel-docs
+This package containg development documentation files for %{name}.
+
 
 %prep
 %setup -q
-
 %patch0 -p1 -b .orig
-%patch1 -p1 -b .sort_cs
-%patch2 -p1 -b .slasla
-%patch3 -p1 -b .desk_vol
+
+%patch1 -p1 -b .dso
+autoreconf -fi
 
 # treak rpath
 sed -i.libdir_syssearch -e \
@@ -106,13 +109,13 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
 desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
-
 %find_lang %{name}
 
 echo '%%defattr(-,root,root,-)' > base-header.files
 echo '%%defattr(-,root,root,-)' > gtk-header.files
+GTKBASEDIR=%{_datadir}/gtk-doc/html/%{name}
+
 for f in $RPM_BUILD_ROOT%_includedir/%name/%name/*.h
 do
   bf=$(basename $f)
@@ -192,8 +195,17 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/%{name}-gtk.so
 %{_libdir}/pkgconfig/libfm-gtk.pc
 
+%files devel-docs
+%defattr(-,root,root,-)
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/%{name}
+
 
 %changelog
+* Wed Oct 13 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.14-1
+- Update to 0.1.14, drop patches
+
 * Fri Jun 25 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.1.12-4
 - Fix crash with --desktop mode when clicking volume icon
   (bug 607069)
diff --git a/sources b/sources
index 50a7ee9..51a12d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6dbc9a30efb5ad0a2c7a0fc54b1ee57c  libfm-0.1.12.tar.gz
+d55e51dced6bb9ef46665243b079761f  libfm-0.1.14.tar.gz