From: Marcin Krol <hawk@tld-linux.org>
Date: Fri, 17 Jul 2015 16:07:00 +0000 (+0000)
Subject: - updated to 1.3.5a, drop systemd leftovers
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=0cc52f8484e8ff5f6b6697164bbd5f4bf485dbdf;p=packages%2Fproftpd.git

- updated to 1.3.5a, drop systemd leftovers
---

diff --git a/proftpd.spec b/proftpd.spec
index 63e346e..6819863 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -23,13 +23,13 @@ Summary(pl.UTF-8):	PROfesionalny serwer FTP
 Summary(pt_BR.UTF-8):	Servidor FTP profissional, com sintaxe de configuração semelhante à do apache
 Summary(zh_CN.UTF-8):	易于管理的,安全的 FTP 服务器
 Name:		proftpd
-Version:	1.3.5
-Release:	2
+Version:	1.3.5a
+Release:	1
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Daemons
 Source0:	ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz
-# Source0-md5:	aff1bff40e675244d72c4667f203e5bb
+# Source0-md5:	b9d3092411478415b31d435f8e26d173
 # https://github.com/jbenden/mod_clamav
 Source1:	mod_clamav-%{mod_clamav_version}.tar.xz
 # Source1-md5:	89ec19115d9ea7c7f4e0b0c4551e69bc
@@ -44,7 +44,6 @@ Source9:	%{name}-mod_pam.conf
 Source10:	%{name}-mod_tls.conf
 Source11:	%{name}-anonftp.conf
 Source12:	%{name}-mod_clamav.conf
-Source13:	%{name}.tmpfiles
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-noautopriv.patch
 URL:		http://www.proftpd.org/
@@ -499,8 +498,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{pam.d,security,sysconfig/rc-inetd,rc.d/init.d} \
 	$RPM_BUILD_ROOT/var/{lib/ftp/pub/Incoming,log,run/proftpd} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/conf.d \
-	$RPM_BUILD_ROOT%{_includedir}/%{name} \
-	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+	$RPM_BUILD_ROOT%{_includedir}/%{name}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -544,8 +542,6 @@ bzip2 -dc %{SOURCE7} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 :> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers.default
 :> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers
 
-install %{SOURCE13} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
-
 # only for -inetd package?
 ln -sf proftpd $RPM_BUILD_ROOT%{_sbindir}/ftpd
 
@@ -667,7 +663,6 @@ fi
 %attr(755,root,root) %{_libexecdir}/mod_ifsession.so
 %attr(755,root,root) %{_libexecdir}/mod_lang.so
 %dir %{_localstatedir}/proftpd
-/usr/lib/tmpfiles.d/%{name}.conf
 %{_mandir}/man5/*
 %lang(ja) %{_mandir}/ja/man5/ftpusers*
 %lang(pl) %{_mandir}/pl/man5/ftpusers*
diff --git a/proftpd.tmpfiles b/proftpd.tmpfiles
deleted file mode 100644
index 2eaa4e7..0000000
--- a/proftpd.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/proftpd 0755 root root -