[pcmanfm] Use git head to fix desktop background issue after

Mamoru Tasaka mtasaka at fedoraproject.org
Sat Aug 31 17:40:01 UTC 2013


commit 2ecc4983cc2ddb2a388f49994d98dcf66c3cc0e9
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Sun Sep 1 02:39:39 2013 +0900

    Use git head to fix desktop background issue after
    
      pcmanfm exit
    - Also remove old mimetype (ref: bug 988831)

 .gitignore   |    1 +
 pcmanfm.spec |   29 ++++++++++++++++++++---------
 sources      |    2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 414b8b2..7c62737 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ pcmanfm-0.9.7.tar.gz
 /pcmanfm-1.1.0.tar.gz
 /pcmanfm-1.1.1.tar.gz
 /pcmanfm-1.1.2.tar.gz
+/pcmanfm-1.1.2-D20130830gitfc8adaab77.tar.gz
diff --git a/pcmanfm.spec b/pcmanfm.spec
index bf7b681..fa99130 100644
--- a/pcmanfm.spec
+++ b/pcmanfm.spec
@@ -5,13 +5,13 @@
 # Upstream git:
 # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm
 
-%global         usegit      0
-%global         mainrel     1
+%global         usegit      1
+%global         mainrel     2
 
-%global         githash     7cb8211245a71b82705095e5fc5cb9cfd14f114e
+%global         githash     fc8adaab77f2cc9120deaf905f732e6a7ec1a8a4
 %global         shorthash   %(TMP=%githash ; echo ${TMP:0:10})
-%global         gitdate    	Fri Aug 9 19:54:52 2013 +0000
-%global         gitdate_num 20130809
+%global         gitdate    	Fri Aug 30 19:14:03 2013 +0300
+%global         gitdate_num 20130830
 
 %if 0%{?usegit} >= 1
 %global         fedorarel   %{mainrel}.D%{gitdate_num}git%{shorthash}
@@ -30,7 +30,7 @@ Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://pcmanfm.sourceforge.net/
 %if 0%{?usegit} >= 1
-Source0:        %{name}-%{version}-D%{gitdate_num}git%{shorthash}.tar.gz
+Source0:	%{name}-%{version}-D%{gitdate_num}git%{shorthash}.tar.gz
 %else
 Source0:	http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz
 %endif
@@ -47,6 +47,11 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	intltool
 
+%if 0%{?usegit} >= 1
+BuildRequires:	automake
+BuildRequires:	intltool
+%endif
+
 # Still needed for removable media - still now really?
 %if 0%{?fedora} < 16
 Requires:	hal-storage-addon
@@ -60,10 +65,11 @@ which features tabbed browsing and user-friendly interface.
 
 %prep
 %setup -q
-#install -cpm 644 %{SOURCE1} data/
-install -cpm 644 %{SOURCE1} %{SOURCE2} data/
+#install -cpm 644 %{SOURCE1} %{SOURCE2} data/
 
-#sh autogen.sh
+%if 0%{?usegit} >= 1
+sh autogen.sh
+%endif
 
 # permission fix
 chmod 0644 [A-Z]*
@@ -117,6 +123,11 @@ exit 0
 %config(noreplace) %{_sysconfdir}/xdg/%{name}/
 
 %changelog
+* Sun Sep  1 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.1.2-2.D20130830gitfc8adaab77
+- Use git head to fix desktop background issue after
+  pcmanfm exit
+- Also remove old mimetype (ref: bug 988831)
+
 * Thu Aug 15 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.1.2-1
 - 1.1.2
 
diff --git a/sources b/sources
index e51d598..039171e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-41104699e653ff2b0a9a9e80a257d6a2  pcmanfm-1.1.2.tar.gz
+b32e3a7fbea2858d9571907129c4e417  pcmanfm-1.1.2-D20130830gitfc8adaab77.tar.gz


More information about the scm-commits mailing list