[ppp] spec: don't ship /var/lock/ppp in rpm payload
Michal Sekletar
msekleta at fedoraproject.org
Sun Jul 28 15:24:33 UTC 2013
commit f6b684d242ecab164de4bea2bd6b2670a14065a7
Author: Michal Sekletar <msekleta at redhat.com>
Date: Fri Jul 12 15:45:34 2013 +0200
spec: don't ship /var/lock/ppp in rpm payload
Recent changes in filesystem package prevent installation of ppp in
chroot because /run/lock directory is not created by filesystem
package anymore. To make things work again, we create ppp subdir in
%post scriptlet and mark it as %ghost.
Resolves: #980100
ppp.spec | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/ppp.spec b/ppp.spec
index eaee48b..f177c05 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -1,7 +1,7 @@
Summary: The Point-to-Point Protocol daemon
Name: ppp
Version: 2.4.5
-Release: 31%{?dist}
+Release: 32%{?dist}
License: BSD and LGPLv2+ and GPLv2+ and Public Domain
Group: System Environment/Daemons
URL: http://www.samba.org/ppp
@@ -129,6 +129,9 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ppp
%pre
getent group dip >/dev/null 2>&1 || groupadd -r -g 40 dip >/dev/null 2>&1 || :
+%post
+mkdir -p %{_localstatedir}/lock/ppp
+
%files
%defattr(-,root,root)
%{_sbindir}/chat
@@ -146,7 +149,7 @@ getent group dip >/dev/null 2>&1 || groupadd -r -g 40 dip >/dev/null 2>&1 || :
%{_libdir}/pppd
%dir %{_sysconfdir}/ppp
%dir %{_localstatedir}/run/ppp
-%dir %{_localstatedir}/lock/ppp
+%ghost %dir %{_localstatedir}/lock/ppp
%dir %{_sysconfdir}/logrotate.d
%attr(700, root, root) %dir %{_localstatedir}/log/ppp
%config %{_prefix}/lib/tmpfiles.d/ppp.conf
@@ -165,6 +168,9 @@ getent group dip >/dev/null 2>&1 || groupadd -r -g 40 dip >/dev/null 2>&1 || :
%doc PLUGINS
%changelog
+* Fri Jul 12 2013 Michal Sekletar <msekleta at redhat.com> - 2.4.5-32
+- don't ship /var/lock/ppp in rpm payload and create it in %post instead
+
* Thu Jul 04 2013 Michal Sekletar <msekleta at redhat.com> - 2.4.5-31
- fix possible NULL pointer dereferencing
More information about the scm-commits
mailing list