[rwho] Remove syslog.target from unit requries, it doesn't need to exist

Honza Horak hhorak at fedoraproject.org
Fri May 24 10:55:15 UTC 2013


commit 54a70b549a5c247efb6423e19fa259bb2b70d1e4
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date:   Fri May 24 12:54:58 2013 +0200

    Remove syslog.target from unit requries, it doesn't need to exist

 rwho.spec     |   14 ++++----------
 rwhod.service |    3 ++-
 2 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/rwho.spec b/rwho.spec
index d7443d3..d907315 100644
--- a/rwho.spec
+++ b/rwho.spec
@@ -1,7 +1,7 @@
 Summary: Displays who is logged in to local network machines
 Name: rwho
 Version: 0.17
-Release: 50%{?dist}
+Release: 51%{?dist}
 # part of rwhod is under GPL+, other parts are under BSD
 License: BSD and GPL+
 Group: System Environment/Daemons
@@ -23,7 +23,6 @@ Patch12: rwho-0.17-stderr.patch
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
-Requires(post): systemd-sysv
 BuildRequires: systemd-units
 
 %description
@@ -81,14 +80,6 @@ install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_unitdir}/rwhod.service
 %post
 %systemd_post rwhod.service
 
-# Package with native systemd unit file is installed for the first time
-%triggerun -- rwho < 0.17-36
-%{_bindir}/systemd-sysv-convert --save rwhod >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del rwhod >/dev/null 2>&1 || :
-/bin/systemctl try-restart rwhod.service >/dev/null 2>&1 || :
-
 %preun
 %systemd_preun rwhod.service
 
@@ -107,6 +98,9 @@ install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_unitdir}/rwhod.service
 %{_unitdir}/*
 
 %changelog
+* Fri May 24 2013 Honza Horak - 0.17-51
+- Remove syslog.target from unit requries, it doesn't need to exist
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-50
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/rwhod.service b/rwhod.service
index d5e166e..be28b3e 100644
--- a/rwhod.service
+++ b/rwhod.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Remote Machine Logged In User Lister
-Requires=syslog.target network.target
+Requires=network.target
+After=syslog.target network.target
 
 [Service]
 Type=forking


More information about the scm-commits mailing list