[xfe] 1.40

[Mamoru TASAKA]

commit 24093e812bcdfe929c021510b24da25975f52f6e
Author: John <mtasaka at fedoraproject.org>
Date:   Tue Jan 13 16:06:19 2015 +0900

    1.40

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 ...-libsn.patch => xfe-1.40-use-system-libsn.patch |   38 +++++---------------
 xfe.spec                                           |   16 ++++----
 4 files changed, 19 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e6cf973..aa1e3b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /xfe-1.34.tar.gz
 /xfe-1.35.tar.gz
 /xfe-1.37.tar.gz
+/xfe-1.40.tar.gz
diff --git a/sources b/sources
index 1323ac7..cb0d850 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce2a317ab4f7d728878d815afe13c1be  xfe-1.37.tar.gz
+09854d424fd9e602b21aa3a363f3b5b7  xfe-1.40.tar.gz
diff --git a/xfe-1.34-use-system-libsn.patch b/xfe-1.40-use-system-libsn.patch
similarity index 76%
rename from xfe-1.34-use-system-libsn.patch
rename to xfe-1.40-use-system-libsn.patch
index be037a2..6534a0d 100644
--- a/xfe-1.34-use-system-libsn.patch
+++ b/xfe-1.40-use-system-libsn.patch
@@ -1,6 +1,6 @@
---- xfe-1.34/configure.ac.syssn	2013-02-07 17:49:40.000000000 +0900
-+++ xfe-1.34/configure.ac	2013-05-04 17:07:43.000000000 +0900
-@@ -165,11 +165,16 @@
+--- xfe-1.40/configure.ac.syssn	2014-12-05 23:51:29.000000000 +0900
++++ xfe-1.40/configure.ac	2015-01-13 14:53:37.283949293 +0900
+@@ -170,11 +170,16 @@
  AC_MSG_RESULT([$enable_sn])
  AC_SUBST(STARTUPNOTIFY,false)
  if test "x$enable_sn" != "xno"; then
@@ -20,9 +20,9 @@
  
  
  # Building for debugging
---- xfe-1.34/src/Makefile.am.syssn	2013-02-07 17:48:39.000000000 +0900
-+++ xfe-1.34/src/Makefile.am	2013-05-04 17:13:07.000000000 +0900
-@@ -40,18 +40,7 @@
+--- xfe-1.40/src/Makefile.am.syssn	2014-11-25 19:31:00.000000000 +0900
++++ xfe-1.40/src/Makefile.am	2015-01-13 14:55:30.512706409 +0900
+@@ -42,18 +42,7 @@
  			  XFileExplorer.cpp \
                main.cpp
  
@@ -42,7 +42,7 @@
  
  
  xfp_SOURCES = ../xvt/command.c \
-@@ -79,18 +68,7 @@
+@@ -81,18 +70,7 @@
   			  DirHistBox.cpp \
                XFilePackage.cpp
  
@@ -59,30 +59,10 @@
 -
 -xfp_LDADD = @LIBINTL@ -lutil
 +xfp_LDADD = @LIBINTL@ -lutil @LIBSN_LIBS@
- 
- 
- xfv_SOURCES = ../xvt/command.c \
-@@ -120,18 +98,7 @@
- 			  FontDialog.cpp \
-               XFileView.cpp
- 
--if STARTUPNOTIFY
--xfv_SOURCES += ../libsn/sn-common.c  \
--              ../libsn/sn-launchee.c \
--              ../libsn/sn-launcher.c \
--              ../libsn/sn-list.c \
--              ../libsn/sn-monitor.c \
--              ../libsn/sn-util.c \
--              ../libsn/sn-xmessages.c \
--              ../libsn/sn-xutils.c
--endif
--
--xfv_LDADD = @LIBINTL@ -lutil
-+xfv_LDADD = @LIBINTL@ -lutil @LIBSN_LIBS@
  	  
  
  xfw_SOURCES = ../xvt/command.c \
-@@ -161,18 +128,7 @@
+@@ -122,18 +100,7 @@
  			  FontDialog.cpp \
                XFileWrite.cpp
  
@@ -102,7 +82,7 @@
  
  				
  xfi_SOURCES = ../xvt/command.c \
-@@ -200,23 +156,12 @@
+@@ -161,23 +128,12 @@
   			  PathLinker.cpp \
                XFileImage.cpp
  
diff --git a/xfe.spec b/xfe.spec
index 50345e5..ac0d7fc 100644
--- a/xfe.spec
+++ b/xfe.spec
@@ -1,15 +1,13 @@
 Name:		xfe
-Version:	1.37
-Release:	3%{?dist}
+Version:	1.40
+Release:	1%{?dist}
 Summary:	X File Explorer File Manager
 
 License:	GPLv2+
 URL:		http://roland65.free.fr/xfe/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Use system-wide startup-notification: need discuss with upstream
-Patch0:	xfe-1.34-use-system-libsn.patch
-# Patch for freetype 2.5.3 header place change
-Patch1:	xfe-1.37-freetype-253.patch
+Patch0:	xfe-1.40-use-system-libsn.patch
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	fox-devel
@@ -39,7 +37,6 @@ This package contains extra theme files for %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .syssn
-%patch1 -p1 -b .freetype253
 
 for f in \
 	ChangeLog
@@ -69,7 +66,7 @@ make %{?_smp_mflags}
 mkdir -p %{buildroot}%{_datadir}/%{name}/pixmaps
 mkdir -p %{buildroot}%{_bindir}
 for suffix in \
-	i e p v w
+	i e p w
 do
 	cat > %{buildroot}%{_bindir}/xfe-xf${suffix} <<EOF
 #!/bin/sh
@@ -107,7 +104,7 @@ update-desktop-database &> /dev/null || :
 %files	-f %{name}.lang
 %doc	AUTHORS
 %doc	BUGS
-%doc	COPYING
+%license	COPYING
 %doc	ChangeLog
 %doc	README
 %doc	TODO
@@ -132,6 +129,9 @@ update-desktop-database &> /dev/null || :
 %exclude	%{_datadir}/%{name}/icons/gnome*-theme/
 
 %changelog
+* Tue Jan 13 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.40-1
+- 1.40
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.37-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild