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

[Mamoru Tasaka]

commit 3e827931930ea34164fb716077e6206b66c936d0
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Dec 5 19:42:20 2010 +0900

    - Update to the latest git

 .gitignore   |    1 +
 pcmanfm.spec |   40 +++++++++++++++++++++++++++++++---------
 sources      |    2 +-
 3 files changed, 33 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2a0cb21..99da835 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 pcmanfm-0.9.7.tar.gz
 /pcmanfm-0.9.8.tar.gz
+/pcmanfm-0.9.9-git0f075cf5ba8fe1ba5c317ebd2babece067852f18.tar.gz
diff --git a/pcmanfm.spec b/pcmanfm.spec
index b03aa62..38ef354 100644
--- a/pcmanfm.spec
+++ b/pcmanfm.spec
@@ -1,19 +1,35 @@
 # Upstream git:
 # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm
 
-%global	libfm_minver	0.1.14
+%global         usegit      1
+%global         mainrel     1
+
+%global         githash     0f075cf5ba8fe1ba5c317ebd2babece067852f18
+%global         shorthash   %(TMP=%githash ; echo ${TMP:0:10})
+
+%if 0%{?usegit} >= 1
+%global         fedorarel   %{mainrel}.git%{shorthash}
+%else
+%global         fedorarel   %{mainrel}
+%endif
+
+%global	libfm_minver	0.1.15-1
 
 Name:		pcmanfm
-Version:	0.9.8
-Release:	1%{?dist}
+Version:	0.9.9
+Release:	%{fedorarel}%{?dist}
 Summary:	Extremly fast and lightweight file manager
 
 Group:		User Interface/Desktops
 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
-# Missing in the tarball, taken from git tree
-Source1:	pcmanfm.conf
+%endif
+## Missing in the tarball, taken from git tree
+#Source1:	pcmanfm.conf
 
 BuildRequires:	libfm-gtk-devel >= %{libfm_minver}
 BuildRequires:	menu-cache-devel
@@ -22,16 +38,17 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	intltool
 
+BuildRequires:  automake
+BuildRequires:  libtool
+
 # For compatibility
 %if 0%{?fedora} <= 13
 BuildRequires:	lxde-icon-theme
 %endif
 # Still needed for removable media
-%if 0%{?fedora} > 12
 Requires:	hal-storage-addon
-%endif
 # Write explicitly
-Requires:	libfm >= %{Libfm_minver}
+Requires:	libfm >= %{libfm_minver}
 
 %description
 PCMan File Manager is an extremly fast and lightweight file manager 
@@ -39,7 +56,9 @@ which features tabbed browsing and user-friendly interface.
 
 %prep
 %setup -q
-install -cpm 644 %{SOURCE1} data/
+#install -cpm 644 %{SOURCE1} data/
+
+sh autogen.sh
 
 # permission fix
 chmod 0644 [A-Z]*
@@ -104,6 +123,9 @@ exit 0
 %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.9.8-1
 - Update to 0.9.8
 
diff --git a/sources b/sources
index ec3fcda..bdf8f9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba0d76cdc20e43a19410882dc2659a73  pcmanfm-0.9.8.tar.gz
+1386ebddc239694eebaaac382b39e8e4  pcmanfm-0.9.9-git0f075cf5ba8fe1ba5c317ebd2babece067852f18.tar.gz