From 871f362c447a33d8342c63eac708e4d72d63e553 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Tue, 30 Nov 2010 15:29:41 +0000 Subject: [PATCH] Require systemd-units for ownership of /etc/tmpfiles.d directory --- pptp.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pptp.spec b/pptp.spec index d9ee1bd..145b4e2 100644 --- a/pptp.spec +++ b/pptp.spec @@ -1,6 +1,6 @@ Name: pptp Version: 1.7.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Point-to-Point Tunneling Protocol (PPTP) Client Group: Applications/Internet License: GPLv2+ @@ -18,6 +18,9 @@ Patch7: pptp-1.7.2-conn-free.patch Patch8: pptp-1.7.2-conn-free2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ppp >= 2.4.2, /sbin/ip +%if 0%{?fedora} > 14 +Requires: systemd-units +%endif %description Client for the proprietary Microsoft Point-to-Point Tunneling @@ -78,8 +81,10 @@ tunnels. # Make sure /var/run/pptp exists at boot time for systems # with /var/run on tmpfs (#656672) +%if 0%{?fedora} > 14 %{__install} -d -m 755 %{buildroot}%{_sysconfdir}/tmpfiles.d -%{__install} -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/tmpfiles.d/pptp.conf +%{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/tmpfiles.d/pptp.conf +%endif %clean %{__rm} -rf %{buildroot} @@ -88,7 +93,9 @@ tunnels. %defattr(-,root,root,-) %doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING %doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY +%if 0%{?fedora} > 14 %{_sysconfdir}/tmpfiles.d/pptp.conf +%endif %{_sbindir}/pptp %{_mandir}/man8/pptp.8* %dir %attr(750,root,root) %{_localstatedir}/run/pptp/ @@ -102,6 +109,9 @@ tunnels. %{_mandir}/man8/pptpsetup.8* %changelog +* Tue Nov 30 2010 Paul Howarth 1.7.2-11 +- Require systemd-units for ownership of /etc/tmpfiles.d directory + * Thu Nov 25 2010 Paul Howarth 1.7.2-10 - Add /etc/tmpfiles.d/pptp.conf to create /var/run/pptp at boot time for systems with /var/run on tmpfs (#656672)