[rsyslog/f15] upgrade to version 5.8.2

[Tomas Heinrich]

commit 4797f92cf55024331b2ef8c08e7719e7a19e9e12
Author: Tomas Heinrich <theinric at redhat.com>
Date:   Tue Jun 28 17:02:47 2011 +0200

    upgrade to version 5.8.2
    
    - use a macro in unit file's path
    - correct systemd scriptlets (#705829)

 .gitignore   |    1 +
 rsyslog.spec |   23 ++++++++++++++---------
 sources      |    2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f0ef81..1078598 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ rsyslog-4.6.3.tar.gz
 /rsyslog-5.5.7.tar.gz
 /rsyslog-5.6.2.tar.gz
 /rsyslog-5.7.9.tar.gz
+/rsyslog-5.8.2.tar.gz
diff --git a/rsyslog.spec b/rsyslog.spec
index 976e6f4..9eef9a6 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -5,8 +5,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
-Version: 5.7.9
-Release: 3%{?dist}
+Version: 5.8.2
+Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -23,7 +23,7 @@ Requires: logrotate >= 3.5.2
 Requires: bash >= 2.0
 Requires(post): /sbin/chkconfig coreutils
 Requires(post): systemd-units >= 20
-Requires(preun): /sbin/chkconfig /sbin/service
+Requires(preun): /sbin/service
 Requires(preun): systemd-units >= 20
 Requires(postun): /sbin/service
 Requires(postun): systemd-units >= 20
@@ -179,7 +179,6 @@ rm $RPM_BUILD_ROOT/%{_libdir}/rsyslog/*.la
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add rsyslog
 for n in /var/log/{messages,secure,maillog,spooler}
 do
 	[ -f $n ] && continue
@@ -193,7 +192,6 @@ fi
 
 %preun
 if [ $1 = 0 ]; then
-        /sbin/chkconfig --del rsyslog
         # On uninstall (not upgrade), disable and stop the units
         /bin/systemctl --no-reload disable rsyslog.service >/dev/null 2>&1 || :
         /bin/systemctl stop rsyslog.service >/dev/null 2>&1 || :
@@ -209,9 +207,11 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %triggerun -- rsyslog < 5.7.8-1
-if /sbin/chkconfig --level 3 rsyslog ; then
-        /bin/systemctl --no-reload enable rsyslog.service >/dev/null 2>&1 || :
-fi
+%{_bindir}/systemd-sysv-convert --save rsyslog >/dev/null 2>&1 || :
+/bin/systemctl enable rsyslog.service >/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
 [ -f /var/lock/subsys/rsyslogd ] || exit 0
 mv /var/lock/subsys/rsyslogd /var/lock/subsys/rsyslog
@@ -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,11 @@ mv /var/lock/subsys/rsyslogd /var/lock/subsys/rsyslog
 %{_libdir}/rsyslog/omudpspoof.so
 
 %changelog
+* Tue Jun 28 2011 Tomas Heinrich <theinric at redhat.com> - 5.8.2-1
+- upgrade to new upstream version 5.8.2
+- use macro in unit file's path
+- correct systemd scriptlets (#705829)
+
 * Mon May 16 2011 Bill Nottingham <notting at redhat.com> - 5.7.9-3
 - combine triggers (as rpm will only execute one) - fixes upgrades (#699198)
 
diff --git a/sources b/sources
index d45d8d0..a760370 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f0916da37e23cba1265e3b72f114657  rsyslog-5.7.9.tar.gz
+fd7822622e974cc263bbd54768d5621c  rsyslog-5.8.2.tar.gz