[vdradmin-am] Systemd unit: Add Documentation, remove obsolete After=syslog.target.

Ville Skyttä scop at fedoraproject.org
Fri Feb 8 11:02:15 UTC 2013


commit adac99abadbdee828b572b621839886743ec8e50
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Feb 8 13:02:00 2013 +0200

    Systemd unit: Add Documentation, remove obsolete After=syslog.target.

 vdradmin-am.spec  |    9 +++++++--
 vdradmind.service |    4 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/vdradmin-am.spec b/vdradmin-am.spec
index 3f4daf5..d5c0b1f 100644
--- a/vdradmin-am.spec
+++ b/vdradmin-am.spec
@@ -3,7 +3,7 @@
 
 Name:           vdradmin-am
 Version:        3.6.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Web interface for VDR
 
 # infobox.js is GPLv2, crystal icons LGPLv2+, everything else GPLv2+
@@ -72,7 +72,9 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
 cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 install -Dpm 640 vdradmind.conf $RPM_BUILD_ROOT/var/lib/vdradmin/vdradmind.conf
 install -dm 755 $RPM_BUILD_ROOT/var/{cache,log}/vdradmin
-install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/vdradmind.service
+install -dm 755 $RPM_BUILD_ROOT%{_unitdir}
+sed -e 's|/usr/share/doc/vdradmin-am/|%{_docdir}/%{name}-%{version}/|' \
+  < %{SOURCE1} > $RPM_BUILD_ROOT%{_unitdir}/vdradmind.service
 install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/%{name}
 install -dm 500 $RPM_BUILD_ROOT/etc/pki/tls/private/vdradmin
 %find_lang vdradmin
@@ -142,6 +144,9 @@ rm -f %{migrfile} >/dev/null 2>&1 || :
 
 
 %changelog
+* Fri Feb  8 2013 Ville Skyttä <ville.skytta at iki.fi> - 3.6.9-4
+- Systemd unit: Add Documentation, remove obsolete After=syslog.target.
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/vdradmind.service b/vdradmind.service
index 0efcdb8..3a9a460 100644
--- a/vdradmind.service
+++ b/vdradmind.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=WWW interface daemon for VDR
-After=syslog.target vdr.service
+Documentation=man:vdradmind(8)
+Documentation=file:///usr/share/doc/vdradmin-am/INSTALL
+After=vdr.service
 
 [Service]
 ExecStart=/usr/sbin/vdradmind --nofork


More information about the scm-commits mailing list