- rebuild with net-snmp 5.8

[packages/rsyslog.git] / rsyslog.spec

diff --git a/rsyslog.spec b/rsyslog.spec
index 8d2fc005b27c0bd6928c9b79f0baf4c4cc0decbe..0f7f069ec4000fa31b6f42e06682b25fc6dff51e 100644 (file)
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -16,12 +16,12 @@ Summary(pl.UTF-8):  Programy logujące zdarzenia w systemie i jądrze Linuksa
 Summary(pt_BR.UTF-8):  Registrador de log do sistema linux
 Summary(tr.UTF-8):     Linux sistem ve çekirdek kayıt süreci
 Name:          rsyslog
-Version:       5.8.6
-Release:       5
+Version:       8.26.0
+Release:       3
 License:       GPL v3+
 Group:         Daemons
 Source0:       http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
-# Source0-md5: c46db0496066b82faf735bd4222208d7
+# Source0-md5: abe20d1621d1e73326c08b964a556ed7
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.sysconfig
@@ -29,10 +29,14 @@ Source4:    %{name}.logrotate
 Patch0:                rsyslog-systemd.patch
 URL:           http://www.rsyslog.com/
 %{?with_gssapi:BuildRequires:  heimdal-devel}
+BuildRequires: libdbi-devel
 %{?with_mysql:BuildRequires:   mysql-devel}
 %{?with_snmp:BuildRequires:    net-snmp-devel}
 BuildRequires: pkgconfig
 %{?with_pgsql:BuildRequires:   postgresql-devel}
+BuildRequires: libestr-devel >= 0.1.9
+BuildRequires: libfastjson-devel >= 0.99.3
+BuildRequires: liblogging-stdlog-devel >= 1.0.3
 BuildRequires: libnet-devel
 BuildRequires: gnutls-devel
 BuildRequires: rpmbuild(macros) >= 1.626
@@ -47,13 +51,14 @@ Requires(pre):      /usr/lib/rpm/user_group.sh
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(pre): /usr/sbin/usermod
+Requires(post,preun,postun):   systemd-units >= 38
 Requires(triggerpostun):       sed >= 4.0
 # for vservers we don't need klogd and syslog works without klogd
 # (just it doesn't log kernel buffer into syslog)
 # Requires:    klogd
 Requires:      logrotate >= 3.2-3
 Requires:      psmisc >= 20.1
-Requires:      systemd-units >= 37-0.10
+Requires:      systemd-units >= 38
 Provides:      group(syslog)
 Provides:      service(klogd)
 Provides:      service(syslog)
@@ -63,6 +68,8 @@ Obsoletes:    msyslog
 Obsoletes:     rsyslog-systemd
 Obsoletes:     sysklogd
 Obsoletes:     syslog-ng
+Conflicts:     cronie < 1.5.0-3
+Conflicts:     fcron < 3.1.2-5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -184,6 +191,7 @@ IETF standard protocol.
        --enable-mmsnmptrapd \
        --enable-omdbalerting \
        --enable-omprog \
+       --enable-omruleset \
        --enable-omstdout \
        --enable-omtemplate \
        --enable-omudpspoof \
@@ -218,7 +226,7 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rsyslog
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/rsyslog
 
-for n in debug kernel maillog messages secure syslog user spooler lpr daemon; do
+for n in cron daemon debug kernel lpr maillog messages secure spooler syslog user; do
        > $RPM_BUILD_ROOT/var/log/$n
 done
 
@@ -249,6 +257,7 @@ done
 %service rsyslog restart "%{name} daemon"
 
 %systemd_post rsyslog.service
+ln -sf /lib/systemd/system/rsyslog.service /etc/systemd/system/syslog.service || :
 
 %preun
 if [ "$1" = "0" ]; then
@@ -285,16 +294,20 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rsyslog
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/rsyslog
 %attr(754,root,root) /etc/rc.d/init.d/rsyslog
-%attr(640,root,root) %ghost /var/log/*
+%attr(640,root,logs) %ghost /var/log/*
 /lib/systemd/system/rsyslog.service
 %attr(755,root,root) %{_sbindir}/rsyslogd
 %dir %{_libdir}/rsyslog
+%attr(755,root,root) %{_libdir}/rsyslog/imdiag.so
 %attr(755,root,root) %{_libdir}/rsyslog/imfile.so
 %attr(755,root,root) %{_libdir}/rsyslog/imklog.so
 %attr(755,root,root) %{_libdir}/rsyslog/immark.so
+%attr(755,root,root) %{_libdir}/rsyslog/impstats.so
+%attr(755,root,root) %{_libdir}/rsyslog/imptcp.so
 %attr(755,root,root) %{_libdir}/rsyslog/imtcp.so
 %attr(755,root,root) %{_libdir}/rsyslog/imudp.so
 %attr(755,root,root) %{_libdir}/rsyslog/imuxsock.so
+%attr(755,root,root) %{_libdir}/rsyslog/lmcry_gcry.so
 %attr(755,root,root) %{_libdir}/rsyslog/lmnet.so
 %attr(755,root,root) %{_libdir}/rsyslog/lmnetstrms.so
 %attr(755,root,root) %{_libdir}/rsyslog/lmnsd_ptcp.so
@@ -303,25 +316,18 @@ fi
 %attr(755,root,root) %{_libdir}/rsyslog/lmtcpclt.so
 %attr(755,root,root) %{_libdir}/rsyslog/lmtcpsrv.so
 %attr(755,root,root) %{_libdir}/rsyslog/lmzlibw.so
-%attr(755,root,root) %{_libdir}/rsyslog/omruleset.so
-%attr(755,root,root) %{_libdir}/rsyslog/omtesting.so
-%attr(755,root,root) %{_libdir}/rsyslog/imdiag.so
-%attr(755,root,root) %{_libdir}/rsyslog/impstats.so
-%attr(755,root,root) %{_libdir}/rsyslog/imptcp.so
-%attr(755,root,root) %{_libdir}/rsyslog/imtemplate.so
+%attr(755,root,root) %{_libdir}/rsyslog/mmexternal.so
 %attr(755,root,root) %{_libdir}/rsyslog/mmsnmptrapd.so
-%attr(755,root,root) %{_libdir}/rsyslog/omdbalerting.so
 %attr(755,root,root) %{_libdir}/rsyslog/ommail.so
 %attr(755,root,root) %{_libdir}/rsyslog/omprog.so
+%attr(755,root,root) %{_libdir}/rsyslog/omruleset.so
 %attr(755,root,root) %{_libdir}/rsyslog/omstdout.so
-%attr(755,root,root) %{_libdir}/rsyslog/omtemplate.so
+%attr(755,root,root) %{_libdir}/rsyslog/omtesting.so
 %attr(755,root,root) %{_libdir}/rsyslog/omuxsock.so
 %attr(755,root,root) %{_libdir}/rsyslog/pmaixforwardedfrom.so
 %attr(755,root,root) %{_libdir}/rsyslog/pmcisconames.so
 %attr(755,root,root) %{_libdir}/rsyslog/pmlastmsg.so
-%attr(755,root,root) %{_libdir}/rsyslog/pmrfc3164sd.so
 %attr(755,root,root) %{_libdir}/rsyslog/pmsnare.so
-%attr(755,root,root) %{_libdir}/rsyslog/sm_cust_bindcdr.so
 %{_mandir}/man5/*
 %{_mandir}/man8/*