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

[Mamoru Tasaka]

commit 09edc2b7b2be4ec1f6858dab8553257dc45e6708
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Apr 24 01:31:22 2011 +0900

    Update to the latest git

 .gitignore   |    1 +
 pcmanfm.spec |   23 ++++++++++++++++-------
 sources      |    2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9d02250..e9b7b73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ pcmanfm-0.9.7.tar.gz
 /pcmanfm-0.9.9-git0f075cf5ba8fe1ba5c317ebd2babece067852f18.tar.gz
 /pcmanfm-0.9.9-git43fdda452f2153a825df8f44023247a2ebb46b25.tar.gz
 /pcmanfm-0.9.9-gitbd677a97832406099ada1fd38a5370d43eee2f99.tar.gz
+/pcmanfm-0.9.9-D20110422git3f899d14eb.tar.gz
diff --git a/pcmanfm.spec b/pcmanfm.spec
index 43964f9..832f56a 100644
--- a/pcmanfm.spec
+++ b/pcmanfm.spec
@@ -2,19 +2,20 @@
 # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm
 
 %global         usegit      1
-%global         mainrel     3
+%global         mainrel     5
 
-%global         githash     bd677a97832406099ada1fd38a5370d43eee2f99
+%global         githash     3f899d14eb5c969ad18608af10e63c943b5ec201
 %global         shorthash   %(TMP=%githash ; echo ${TMP:0:10})
-%global         gitdate     Thu Apr 7 17:32:21 2011 +0200
+%global         gitdate     Fri Apr 22 22:28:57 2011 +0200
+%global         gitdate_num 20110422
 
 %if 0%{?usegit} >= 1
-%global         fedorarel   %{mainrel}.git%{shorthash}
+%global         fedorarel   %{mainrel}.D%{gitdate_num}git%{shorthash}
 %else
 %global         fedorarel   %{mainrel}
 %endif
 
-%global	libfm_minver	0.1.15-3
+%global	libfm_minver	0.1.15-4
 
 Name:		pcmanfm
 Version:	0.9.9
@@ -25,7 +26,7 @@ Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://pcmanfm.sourceforge.net/
 %if 0%{?usegit} >= 1
-Source0:        %{name}-%{version}-git%{githash}.tar.gz
+Source0:        %{name}-%{version}-D%{gitdate_num}git%{shorthash}.tar.gz
 %else
 Source0:	http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz
 %endif
@@ -46,8 +47,10 @@ BuildRequires:  libtool
 %if 0%{?fedora} <= 13
 BuildRequires:	lxde-icon-theme
 %endif
-# Still needed for removable media
+# Still needed for removable media - still now really?
+%if 0%{?fedora} < 16
 Requires:	hal-storage-addon
+%endif
 # Write explicitly
 Requires:	libfm >= %{libfm_minver}
 
@@ -120,6 +123,12 @@ exit 0
 %endif
 
 %changelog
+* Sun Apr 24 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.9.9-5
+- Update to the latest git
+
+* Fri Apr 22 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.9.9-4
+- Just kill hal dependency on F-16+
+
 * Sat Apr 09 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.9.9-3
 - Update to the latest git
 
diff --git a/sources b/sources
index d323d50..ca7136f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf67a7e7216352b412b308030d4c0557  pcmanfm-0.9.9-gitbd677a97832406099ada1fd38a5370d43eee2f99.tar.gz
+f6bf9d923d9eefe23ef7fee2940a2286  pcmanfm-0.9.9-D20110422git3f899d14eb.tar.gz