Resolve the file conflict with rsyslog (#811058).
- Don't tag the syslog-ng.service file as a configuration file.
This commit is contained in:
parent
b706e116be
commit
bc24a7618a
|
@ -1,4 +1,9 @@
|
||||||
/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
|
/var/log/cron
|
||||||
|
/var/log/maillog
|
||||||
|
/var/log/messages
|
||||||
|
/var/log/secure
|
||||||
|
/var/log/spooler
|
||||||
|
{
|
||||||
sharedscripts
|
sharedscripts
|
||||||
postrotate
|
postrotate
|
||||||
/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
|
/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
Name: syslog-ng
|
Name: syslog-ng
|
||||||
Version: 3.2.5
|
Version: 3.2.5
|
||||||
Release: 7%{?dist}
|
Release: 8%{?dist}
|
||||||
Summary: Next-generation syslog server
|
Summary: Next-generation syslog server
|
||||||
|
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
|
@ -228,7 +228,7 @@ fi
|
||||||
%config(noreplace) %{_sysconfdir}/%{name}/modules.conf
|
%config(noreplace) %{_sysconfdir}/%{name}/modules.conf
|
||||||
%config(noreplace) %{_sysconfdir}/%{name}/scl.conf
|
%config(noreplace) %{_sysconfdir}/%{name}/scl.conf
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
|
%config(noreplace) %{_sysconfdir}/logrotate.d/syslog
|
||||||
%config(noreplace) %{_unitdir}/%{name}.service
|
%{_unitdir}/%{name}.service
|
||||||
|
|
||||||
%dir %{_sharedstatedir}/%{name}
|
%dir %{_sharedstatedir}/%{name}
|
||||||
%{_sbindir}/%{name}
|
%{_sbindir}/%{name}
|
||||||
|
@ -267,6 +267,10 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Apr 15 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-8
|
||||||
|
- Resolve the file conflict with rsyslog (#811058).
|
||||||
|
- Don't tag the syslog-ng.service file as a configuration file.
|
||||||
|
|
||||||
* Fri Mar 30 2012 Jon Ciesla <limburgher@gmail.com> - 3.2.5-7
|
* Fri Mar 30 2012 Jon Ciesla <limburgher@gmail.com> - 3.2.5-7
|
||||||
- Rebuild for updated libnet.
|
- Rebuild for updated libnet.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue