[libfm/f14/master] - Update to the latest git

[Mamoru Tasaka]

commit a19152a18f130f4afae89332456c6ab8fb3c14fa
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Dec 5 19:14:59 2010 +0900

    - Update to the latest git

 .gitignore |    1 +
 libfm.spec |   55 ++++++++++++++++++++++++++++++++++++++++++-------------
 sources    |    2 +-
 3 files changed, 44 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 31ce336..c5601cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libfm-0.1.12.tar.gz
 /libfm-0.1.14.tar.gz
+/libfm-0.1.15-git3ec0a717adde65f262b5bb2b33ae5eb56e9aea6f.tar.gz
diff --git a/libfm.spec b/libfm.spec
index 6bfc441..a76c5ed 100644
--- a/libfm.spec
+++ b/libfm.spec
@@ -3,19 +3,33 @@
 # Upstream git:
 # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/libfm
 
+%global         usegit      1
+%global         mainrel     1
+
+%global         githash     3ec0a717adde65f262b5bb2b33ae5eb56e9aea6f
+%global         shorthash   %(TMP=%githash ; echo ${TMP:0:10})
+
+%if 0%{?usegit} >= 1
+%global         fedorarel   %{mainrel}.git%{shorthash}
+%else
+%global         fedorarel   %{mainrel}
+%endif
+
 Name:           libfm
-Version:        0.1.14
-Release:        1%{?dist}
+Version:        0.1.15
+Release:        %{fedorarel}%{?dist}
 Summary:        GIO-based library for file manager-like programs
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://pcmanfm.sourceforge.net/
+%if 0%{?usegit} >= 1
+Source0:        %{name}-%{version}-git%{githash}.tar.gz
+%else
 Source0:        http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz
+%endif
 # Fedora specific patches
 Patch0:         libfm-0.1.9-pref-apps.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
@@ -27,6 +41,9 @@ BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  gtk-doc
 
+# For now, -devel-docs does not seem to be generated...
+Obsoletes:      %{name}-devel-docs < 0.1.15
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -89,19 +106,27 @@ This package containg development documentation files for %{name}.
 %setup -q
 %patch0 -p1 -b .orig
 
-%patch1 -p1 -b .dso
-autoreconf -fi
+# Remove -DG_DISABLE_DEPRECATED for G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME
+%if 0%{?fedora} >= 15
+sed -i.deprecated \
+    -e '\@-DG_DISABLE_DEPRECATED at d' \
+    src/Makefile.am
+%endif
+
+sh autogen.sh
 
 # treak rpath
-sed -i.libdir_syssearch -e \
-  '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64 |' \
+sed -i.libdir_syssearch \
+  -e '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64 |' \
   configure
 
+
 %build
-%configure --disable-static
+%configure \
+    --disable-static
 # To show translation status
 make -C po -j1 GMSGFMT="msgfmt --statistics"
-make %{?_smp_mflags}
+make %{?_smp_mflags} -k
 
 
 %install
@@ -172,8 +197,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %defattr(-,root,root,-)
 %{_bindir}/libfm-pref-apps
 %{_libdir}/%{name}-gtk.so.*
-%dir %{_libdir}/libfm/
-%{_libdir}/libfm/gnome-terminal
+#%%dir %{_libdir}/libfm/
+#%%{_libdir}/libfm/gnome-terminal
 %{_datadir}/libfm/
 %{_datadir}/applications/libfm-pref-apps.desktop
 
@@ -194,14 +219,18 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/%{name}-gtk.so
 %{_libdir}/pkgconfig/libfm-gtk.pc
 
+%if 0
 %files devel-docs
 %defattr(-,root,root,-)
 %dir %{_datadir}/gtk-doc
 %dir %{_datadir}/gtk-doc/html
 %{_datadir}/gtk-doc/html/%{name}
-
+%endif
 
 %changelog
+* Sun Dec  5 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Update to the latest git
+
 * 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
 
diff --git a/sources b/sources
index 51a12d9..93f8f18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d55e51dced6bb9ef46665243b079761f  libfm-0.1.14.tar.gz
+c3cd44074cccf161ed694385d32b74c5  libfm-0.1.15-git3ec0a717adde65f262b5bb2b33ae5eb56e9aea6f.tar.gz