rpms/rsyslog
5
0
Fork 0
Code Issues Pull Requests Releases Activity

upgrade to new upstream version

Browse Source 
correct systemd scriptlets (#705829)
This commit is contained in:
Tomas Heinrich 2011-05-20 16:28:21 +02:00
parent 11d915d931
commit 4b35a635c2
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ rsyslog-4.6.3.tar.gz
/rsyslog-5.6.2.tar.gz /rsyslog-5.6.2.tar.gz
/rsyslog-5.7.9.tar.gz /rsyslog-5.7.9.tar.gz
/rsyslog-5.7.10.tar.gz /rsyslog-5.7.10.tar.gz
/rsyslog-5.8.1.tar.gz

20
rsyslog.spec
View File

@ -5,8 +5,8 @@
Summary: Enhanced system logging and kernel message trapping daemon Summary: Enhanced system logging and kernel message trapping daemon
Name: rsyslog Name: rsyslog
Version: 5.7.10 Version: 5.8.1
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv3+ License: GPLv3+
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.rsyslog.com/ URL: http://www.rsyslog.com/
@ -23,7 +23,7 @@ Requires: logrotate >= 3.5.2
Requires: bash >= 2.0 Requires: bash >= 2.0
Requires(post): /sbin/chkconfig coreutils Requires(post): /sbin/chkconfig coreutils
Requires(post): systemd-units >= 20 Requires(post): systemd-units >= 20
Requires(preun): /sbin/chkconfig /sbin/service Requires(preun): /sbin/service
Requires(preun): systemd-units >= 20 Requires(preun): systemd-units >= 20
Requires(postun): /sbin/service Requires(postun): /sbin/service
Requires(postun): systemd-units >= 20 Requires(postun): systemd-units >= 20
@ -179,7 +179,6 @@ rm $RPM_BUILD_ROOT/%{_libdir}/rsyslog/*.la
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post %post
/sbin/chkconfig --add rsyslog
for n in /var/log/{messages,secure,maillog,spooler} for n in /var/log/{messages,secure,maillog,spooler}
do do
[ -f $n ] && continue [ -f $n ] && continue
@ -193,7 +192,6 @@ fi
%preun %preun
if [ $1 = 0 ]; then if [ $1 = 0 ]; then
/sbin/chkconfig --del rsyslog
# On uninstall (not upgrade), disable and stop the units # On uninstall (not upgrade), disable and stop the units
/bin/systemctl --no-reload disable rsyslog.service >/dev/null 2>&1 || : /bin/systemctl --no-reload disable rsyslog.service >/dev/null 2>&1 || :
/bin/systemctl stop 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 fi
%triggerun -- rsyslog < 5.7.8-1 %triggerun -- rsyslog < 5.7.8-1
if /sbin/chkconfig --level 3 rsyslog ; then %{_bindir}/systemd-sysv-convert --save rsyslog >/dev/null 2>&1 || :
/bin/systemctl --no-reload enable rsyslog.service >/dev/null 2>&1 || : /bin/systemctl enable rsyslog.service >/dev/null 2>&1 || :
fi /sbin/chkconfig --del httpd >/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 # previous versions used a different lock file, which would break condrestart
[ -f /var/lock/subsys/rsyslogd ] || exit 0 [ -f /var/lock/subsys/rsyslogd ] || exit 0
mv /var/lock/subsys/rsyslogd /var/lock/subsys/rsyslog mv /var/lock/subsys/rsyslogd /var/lock/subsys/rsyslog
@ -292,6 +292,10 @@ mv /var/lock/subsys/rsyslogd /var/lock/subsys/rsyslog
%{_libdir}/rsyslog/omudpspoof.so %{_libdir}/rsyslog/omudpspoof.so
%changelog %changelog
* Fri May 20 2011 Tomas Heinrich <theinric@redhat.com> 5.8.1-1
- upgrade to new upstream version
- correct systemd scriptlets (#705829)
* Mon May 16 2011 Bill Nottingham <notting@redhat.com> - 5.7.9-3 * Mon May 16 2011 Bill Nottingham <notting@redhat.com> - 5.7.9-3
- combine triggers (as rpm will only execute one) - fixes upgrades (#699198) - combine triggers (as rpm will only execute one) - fixes upgrades (#699198)

2
sources
View File

@ -1 +1 @@
d5c4f3ec749018c3ecd3fdd28cd0cd5e rsyslog-5.7.10.tar.gz 909d4d867450aeedd6b388c199d79222 rsyslog-5.8.1.tar.gz