[libfm/f15/master] Update to the latest git

[Mamoru Tasaka]

commit 1f9937d24dac51069ba09ba918cbbde6d0119523
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Feb 20 05:25:09 2011 +0900

    Update to the latest git

 .gitignore |    1 +
 libfm.spec |   26 ++++++++++++--------------
 sources    |    2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c5601cd..28aebbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 libfm-0.1.12.tar.gz
 /libfm-0.1.14.tar.gz
 /libfm-0.1.15-git3ec0a717adde65f262b5bb2b33ae5eb56e9aea6f.tar.gz
+/libfm-0.1.15-git197c7e1b8e3e439a5e4f3f004a3447aef43b298b.tar.gz
diff --git a/libfm.spec b/libfm.spec
index 4263bd5..44c641a 100644
--- a/libfm.spec
+++ b/libfm.spec
@@ -4,10 +4,11 @@
 # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/libfm
 
 %global         usegit      1
-%global         mainrel     1
+%global         mainrel     2
 
-%global         githash     3ec0a717adde65f262b5bb2b33ae5eb56e9aea6f
+%global         githash     197c7e1b8e3e439a5e4f3f004a3447aef43b298b
 %global         shorthash   %(TMP=%githash ; echo ${TMP:0:10})
+%global         gitdate     Fri Feb 18 21:35:05 2011 +0800
 
 %if 0%{?usegit} >= 1
 %global         fedorarel   %{mainrel}.git%{shorthash}
@@ -17,7 +18,7 @@
 
 Name:           libfm
 Version:        0.1.15
-Release:        %{fedorarel}%{?dist}.1
+Release:        %{fedorarel}%{?dist}
 Summary:        GIO-based library for file manager-like programs
 
 Group:          System Environment/Libraries
@@ -107,9 +108,12 @@ This package containg development documentation files for %{name}.
 %patch0 -p1 -b .orig
 
 # Remove -DG_DISABLE_DEPRECATED for G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME
+# on GLib <= 2.27
+%if 0%{?fedora} < 15
 sed -i.deprecated \
     -e '\@-DG_DISABLE_DEPRECATED at d' \
     src/Makefile.am
+%endif
 
 sh autogen.sh
 
@@ -118,7 +122,6 @@ sed -i.libdir_syssearch \
   -e '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib /lib64 |' \
   configure
 
-
 %build
 %configure \
     --disable-static
@@ -128,7 +131,6 @@ make %{?_smp_mflags} -k
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -159,26 +161,17 @@ done
 
 /usr/lib/rpm/check-rpaths
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 /sbin/ldconfig
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
-
 %postun
 /sbin/ldconfig
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
-
 %post gtk -p /sbin/ldconfig
-
-
 %postun gtk -p /sbin/ldconfig
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 # FIXME: Add ChangeLog and NEWS if not empty
@@ -187,7 +180,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %config(noreplace) %{_sysconfdir}/xdg/libfm/pref-apps.conf
 %config(noreplace) %{_sysconfdir}/xdg/libfm/libfm.conf
 %{_libdir}/%{name}.so.*
+%if 0%{?fedora} < 15
 %{_libdir}/gio/modules/libgiofm.so
+%endif
 %{_datadir}/mime/packages/libfm.xml
 
 
@@ -226,6 +221,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %endif
 
 %changelog
+* Sun Feb 20 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.1.15-2
+- Update to the latest git
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.15-1.git3ec0a717ad.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 93f8f18..4225446 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3cd44074cccf161ed694385d32b74c5  libfm-0.1.15-git3ec0a717adde65f262b5bb2b33ae5eb56e9aea6f.tar.gz
+de4d9dd8afd53813d3e9c38cfe932cc6  libfm-0.1.15-git197c7e1b8e3e439a5e4f3f004a3447aef43b298b.tar.gz