[rsyslog] scriptlet correction, use macro in unit file's path

Tomas Heinrich theinric at fedoraproject.org
Mon Jun 13 15:08:11 UTC 2011


commit c5daf04f662a44cb5f027181e1585570ab5f945f
Author: Tomas Heinrich <theinric at redhat.com>
Date:   Mon Jun 13 17:06:23 2011 +0200

    scriptlet correction, use macro in unit file's path

 rsyslog.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/rsyslog.spec b/rsyslog.spec
index 075161b..74f7081 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -6,7 +6,7 @@
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
 Version: 5.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -209,7 +209,7 @@ fi
 %triggerun -- rsyslog < 5.7.8-1
 %{_bindir}/systemd-sysv-convert --save rsyslog >/dev/null 2>&1 || :
 /bin/systemctl enable rsyslog.service >/dev/null 2>&1 || :
-/sbin/chkconfig --del httpd >/dev/null 2>&1 || :
+/sbin/chkconfig --del rsyslog >/dev/null 2>&1 || :
 /bin/systemctl try-restart rsyslog.service >/dev/null 2>&1 || :
 
 # previous versions used a different lock file, which would break condrestart
@@ -242,7 +242,7 @@ mv /var/lock/subsys/rsyslogd /var/lock/subsys/rsyslog
 %{_libdir}/rsyslog/omruleset.so
 %{_libdir}/rsyslog/omuxsock.so
 %{_libdir}/rsyslog/pmlastmsg.so
-/lib/systemd/system/rsyslog.service
+%{_unitdir}/rsyslog.service
 
 %config(noreplace) %{_sysconfdir}/rsyslog.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
@@ -292,6 +292,10 @@ mv /var/lock/subsys/rsyslogd /var/lock/subsys/rsyslog
 %{_libdir}/rsyslog/omudpspoof.so
 
 %changelog
+* Mon Jun 13 2011 Tomas Heinrich <theinric at redhat.com> 5.8.1-2
+- scriptlet correction
+- use macro in unit file's path
+
 * Fri May 20 2011 Tomas Heinrich <theinric at redhat.com> 5.8.1-1
 - upgrade to new upstream version
 - correct systemd scriptlets (#705829)


More information about the scm-commits mailing list