|
|
@@ -6,7 +6,7 @@
|
|
|
Summary: Enhanced system logging and kernel message trapping daemon
|
|
|
Name: rsyslog
|
|
|
Version: 5.6.2
|
|
|
-Release: 1%{?dist}
|
|
|
+Release: 1%{?_dist_release}
|
|
|
License: GPLv3+
|
|
|
Group: System Environment/Daemons
|
|
|
URL: http://www.rsyslog.com/
|
|
|
@@ -23,15 +23,15 @@ Requires(post): /sbin/chkconfig coreutils
|
|
|
Requires(preun): /sbin/chkconfig /sbin/service
|
|
|
Requires(postun): /sbin/service
|
|
|
Provides: syslog
|
|
|
-Conflicts: sysklogd < 1.4.1-43
|
|
|
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
+Conflicts: sysklogd, syslog-ng
|
|
|
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
|
|
|
%package mysql
|
|
|
Summary: MySQL support for rsyslog
|
|
|
Group: System Environment/Daemons
|
|
|
Requires: %name = %version-%release
|
|
|
-BuildRequires: mysql-devel >= 4.0
|
|
|
+BuildRequires: MySQL-devel >= 4.0
|
|
|
|
|
|
%package pgsql
|
|
|
Summary: PostgresSQL support for rsyslog
|
|
|
@@ -159,13 +159,6 @@ if [ "$1" -ge "1" ]; then
|
|
|
service rsyslog condrestart > /dev/null 2>&1 ||:
|
|
|
fi
|
|
|
|
|
|
-%triggerun -- rsyslog < 3.0.0
|
|
|
-/bin/kill `cat /var/run/rklogd.pid 2> /dev/null` > /dev/null 2>&1 ||:
|
|
|
-
|
|
|
-%triggerun -- rsyslog < 5.6.2
|
|
|
-# 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
|
|
|
|
|
|
%files
|
|
|
%defattr(-,root,root,-)
|
|
|
@@ -228,6 +221,9 @@ mv /var/lock/subsys/rsyslogd /var/lock/subsys/rsyslog
|
|
|
%{_libdir}/rsyslog/omsnmp.so
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Dec 22 2010 IWAI, Masaharu <iwai@alib.jp> 5.6.2-1
|
|
|
+- build for Vine Linux: based Fedora 5.6.2-1.fc15
|
|
|
+
|
|
|
* Mon Dec 20 2010 Tomas Heinrich <theinric@redhat.com> 5.6.2-1
|
|
|
- upgrade to new upstream stable version 5.6.2
|
|
|
- drop rsyslog-5.5.7-remove_include.patch; applied upstream
|
iwaim