[inn/f16] Use tmpfiles.d to create /var/run/news Clean up SPEC file
Jochen Schmitt
s4504kr at fedoraproject.org
Wed Oct 5 19:02:44 UTC 2011
commit 32e477f28fc28a8b4d358c8aa6bb0e96bd25b509
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Wed Oct 5 18:21:54 2011 +0200
Use tmpfiles.d to create /var/run/news
Clean up SPEC file
Unghosting /var/run/news
inn.spec | 18 ++++++++++++++----
innd.service | 2 --
2 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/inn.spec b/inn.spec
index 502e328..6db278a 100644
--- a/inn.spec
+++ b/inn.spec
@@ -1,7 +1,7 @@
Summary: The InterNetNews system, an Usenet news server
Name: inn
Version: 2.5.2
-Release: 16%{?dist}
+Release: 18%{?dist}
#see LICENSE file for details
License: GPLv2+ and BSD and MIT and Public Domain
Group: System Environment/Daemons
@@ -145,7 +145,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make # %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/news/http
make install DESTDIR=$RPM_BUILD_ROOT
@@ -206,8 +205,12 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
# Documentation is installed via rpm %%doc directive
rm -rf $RPM_BUILD_ROOT/usr/doc/
-%clean
-rm -rf $RPM_BUILD_ROOT
+# Use tmpfiles.d to create /var/run/news
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
+cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/inn.conf
+D %{_localstatedir}/run/news 0755 news news -
+EOF
+install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/news
%post
su -m news -c '/usr/libexec/news/makedbz -i -o'
@@ -298,6 +301,9 @@ fi
%{_sysconfdir}/cron.daily/inn-cron-expire
%{_unitdir}/innd.service
%defattr(-,news,news,-)
+# tmpfile.d files
+%config(noreplace) %attr(-,root,root) %{_sysconfdir}/tmpfiles.d/inn.conf
+%dir %{_localstatedir}/run/news
# /etc/news config files
%dir %{_sysconfdir}/news
%config(noreplace) %{_sysconfdir}/news/passwd.nntp
@@ -518,6 +524,10 @@ fi
%{_mandir}/man1/inews*
%changelog
+* Wed Oct 5 2011 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.2-18
+- Use tmpfiles.d to create /var/run/news
+- Clean up SPEC file
+
* Mon Sep 19 2011 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.2-16
- Set PATH for user news to more resticted values
diff --git a/innd.service b/innd.service
index 56d5903..59183f3 100644
--- a/innd.service
+++ b/innd.service
@@ -8,8 +8,6 @@ User=news
PermissionsStartOnly=true
PIDFile=/run/news/innd.pid
Type=forking
-ExecStartPre=/bin/mkdir -p /run/news
-ExecStartPre=/bin/chown -f news:news /run/news
ExecStart=/usr/libexec/news/rc.news
ExecStop=/bin/su -m news -c '/usr/libexec/news/rc.news stop'
KillMode=control-group
More information about the scm-commits
mailing list