[pcmanfm] 1.2.0

Mamoru TASAKA mtasaka at fedoraproject.org
Thu Feb 20 19:43:29 UTC 2014


commit 4c05a1e3b1e4b8536838ff303b6df80a5cd4f500
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Fri Feb 21 04:43:47 2014 +0900

    1.2.0

 .gitignore                            |    1 +
 pcmanfm-1.2.0-create-module-dir.patch |   14 ++++++++++++++
 pcmanfm.spec                          |   15 ++++++++++++++-
 sources                               |    2 +-
 4 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8ee49bb..c86e848 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ pcmanfm-0.9.7.tar.gz
 /pcmanfm-1.1.2.tar.gz
 /pcmanfm-1.1.2-D20130830gitfc8adaab77.tar.gz
 /pcmanfm-1.2.0-rc1.tar.xz
+/pcmanfm-1.2.0.tar.xz
diff --git a/pcmanfm-1.2.0-create-module-dir.patch b/pcmanfm-1.2.0-create-module-dir.patch
new file mode 100644
index 0000000..2a85ca2
--- /dev/null
+++ b/pcmanfm-1.2.0-create-module-dir.patch
@@ -0,0 +1,14 @@
+--- pcmanfm-1.2.0/src/Makefile.am.emptydir	2014-01-07 08:55:25.000000000 +0900
++++ pcmanfm-1.2.0/src/Makefile.am	2014-02-21 04:14:39.000000000 +0900
+@@ -49,3 +49,11 @@
+ 	$(XLIB_LIBS) \
+ 	$(FM_LIBS) \
+ 	$(NULL)
++
++# create plugins' directory anyway
++install-exec-hook:
++	$(MKDIR_P) $(DESTDIR)$(libdir)/pcmanfm
++
++uninstall-hook:
++	-rmdir $(DESTDIR)$(libdir)/pcmanfm
++
diff --git a/pcmanfm.spec b/pcmanfm.spec
index b287ebb..34060cf 100644
--- a/pcmanfm.spec
+++ b/pcmanfm.spec
@@ -3,7 +3,7 @@
 %endif
 
 %global         mainver     1.2.0
-%global         prever      -rc1
+%undefine         prever
 %global         prerpmver    %(echo "%{?prever}" | sed -e 's|-||g')
 
 # Upstream git:
@@ -43,6 +43,9 @@ Source0:	http://downloads.sourceforge.net/pcmanfm/%{name}-%{mainver}%{?prever}.t
 # From git head e2f4578bd5e89c7a1 data/*.desktop.in
 Source1:	pcmanfm.desktop.in
 Source2:	pcmanfm-desktop-pref.desktop.in
+# Create module directory anyway
+# https://sourceforge.net/p/pcmanfm/bugs/831/
+Patch0:	pcmanfm-1.2.0-create-module-dir.patch
 
 BuildRequires:	libfm-gtk-devel >= %{libfm_minver}
 BuildRequires:	menu-cache-devel
@@ -55,6 +58,8 @@ BuildRequires:	intltool
 BuildRequires:	automake
 BuildRequires:	intltool
 %endif
+# Patch0
+BuildRequires:	automake
 
 # Request for now
 Requires:			libfm-gtk-utils
@@ -82,11 +87,15 @@ developing applications that use %{name}.
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 #install -cpm 644 %{SOURCE1} %{SOURCE2} data/
+%patch0 -p1 -b .emptydir
 
 %if 0%{?usegit} >= 1
 sh autogen.sh
 %endif
 
+# Patch0
+autoreconf -fi
+
 # permission fix
 chmod 0644 [A-Z]*
 
@@ -135,6 +144,7 @@ exit 0
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 
+%{_libdir}/%{name}/
 %{_datadir}/%{name}/
 %{_datadir}/applications/*%{name}*.desktop
 %config(noreplace) %{_sysconfdir}/xdg/%{name}/
@@ -143,6 +153,9 @@ exit 0
 %{_includedir}/pcmanfm-modules.h
 
 %changelog
+* Fri Feb 21 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.2.0-1
+- 1.2.0
+
 * Mon Feb 10 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.2.0-0.1.rc1
 - 1.2.0 rc1
 
diff --git a/sources b/sources
index f0f3f55..e623001 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f9a6213cd73a9ac097440c0d5140d161  pcmanfm-1.2.0-rc1.tar.xz
+11d59a492c9802866279a6e7e2b3f49e  pcmanfm-1.2.0.tar.xz


More information about the scm-commits mailing list