[proftpd] Move tmpfiles.d file from %{_sysconfdir} to %{_prefix}/lib
Paul Howarth
pghmcfc at fedoraproject.org
Tue Jul 3 20:18:23 UTC 2012
commit 40124a2152d2c5f650f2e5db30f8b4ea5558bd81
Author: Paul Howarth <paul at city-fan.org>
Date: Tue Jul 3 21:17:33 2012 +0100
Move tmpfiles.d file from %{_sysconfdir} to %{_prefix}/lib
proftpd.spec | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/proftpd.spec b/proftpd.spec
index 01b5071..207f467 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -36,7 +36,7 @@
%define _hardened_build 1
#global prever rc3
-%global rpmrel 9
+%global rpmrel 10
Summary: Flexible, stable and highly-configurable FTP server
Name: proftpd
@@ -93,7 +93,7 @@ Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig
Requires(postun): /sbin/service
%endif
-# Need systemd-units for ownership of /etc/tmpfiles.d directory
+# Need systemd-units for ownership of /usr/lib/tmpfiles.d directory
%if 0%{?rundir_tmpfs:1}
Requires: systemd-units
%endif
@@ -399,9 +399,9 @@ touch %{buildroot}%{_sysconfdir}/ftpusers
# Make sure %%{rundir}/proftpd exists at boot time for systems where it's on tmpfs (#656675)
%if 0%{?rundir_tmpfs:1}
-install -d -m 755 %{buildroot}%{_sysconfdir}/tmpfiles.d
+install -d -m 755 %{buildroot}%{_prefix}/lib/tmpfiles.d
install -p -m 644 contrib/dist/rpm/proftpd-tmpfs.conf \
- %{buildroot}%{_sysconfdir}/tmpfiles.d/proftpd.conf
+ %{buildroot}%{_prefix}/lib/tmpfiles.d/proftpd.conf
%endif
# Find translations
@@ -513,7 +513,7 @@ fi
%{_sysconfdir}/rc.d/init.d/proftpd
%endif
%if 0%{?rundir_tmpfs:1}
-%{_sysconfdir}/tmpfiles.d/proftpd.conf
+%{_prefix}/lib/tmpfiles.d/proftpd.conf
%endif
%{_bindir}/ftpdctl
%{_sbindir}/ftpscrub
@@ -595,6 +595,9 @@ fi
%{_mandir}/man1/ftpwho.1*
%changelog
+* Tue Jul 3 2012 Paul Howarth <paul at city-fan.org> 1.3.4a-10
+- Move tmpfiles.d file from %%{_sysconfdir} to %%{_prefix}/lib
+
* Sat Apr 21 2012 Paul Howarth <paul at city-fan.org> 1.3.4a-9
- Rebuild for new libmemcached in Rawhide
More information about the scm-commits
mailing list