- updated to 2.0.8

[packages/syslog-ng.git] / syslog-ng.spec

diff --git a/syslog-ng.spec b/syslog-ng.spec
index b2088c868db2bd0857be326c86aebe183e29582c..57e0b509d83a0eaa70b1c2f269f5b07ae45af7f0 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -2,38 +2,38 @@
 # Conditional build:
 %bcond_with    dynamic         # link dynamically with glib and eventlog
 #
-%define                mainver         2.0
-%define                minver          2
-
 Summary:       Syslog-ng - new generation of the system logger
 Summary(pl.UTF-8):     Syslog-ng - zamiennik syskloga
 Summary(pt_BR.UTF-8):  Daemon de log nova geração
 Name:          syslog-ng
-Version:       %{mainver}.%{minver}
+Version:       2.0.8
 Release:       1
 License:       GPL v2
 Group:         Daemons
-Source0:       http://www.balabit.com/downloads/syslog-ng/%{mainver}/src/%{name}-%{version}.tar.gz
-# Source0-md5: 7ef12e1e43a99c5b6b8d1984dde72151
+Source0:       http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/%{name}-%{version}.tar.gz
+# Source0-md5: ae48df049aa09bde55d52f3c08aefbac
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.logrotate
 Patch0:                %{name}-link.patch
+Patch1:                %{name}-datadir.patch
 URL:           http://www.balabit.com/products/syslog_ng/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: flex
-BuildRequires: libwrap-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.268
 %if %{with dynamic}
 BuildRequires: eventlog-devel >= 0.2
-BuildRequires: glib2-devel >= 1:2.0.0
+BuildRequires: glib2-devel >= 1:2.2.0
+BuildRequires: libnet-devel >= 1:1.1.2.1-3
+BuildRequires: libwrap-devel
 %else
 BuildRequires: eventlog-static >= 0.2
-BuildRequires: glib2-static >= 1:2.0.0
-BuildRequires: glibc-static
+BuildRequires: glib2-static >= 1:2.2.0
+BuildRequires: libnet-static >= 1:1.1.2.1-3
+BuildRequires: libwrap-static
 %endif
 Requires(post):        fileutils
 Requires(post,preun):  /sbin/chkconfig
@@ -41,13 +41,13 @@ Requires:   logrotate
 Requires:      psmisc >= 20.1
 Requires:      rc-scripts >= 0.2.0
 Provides:      syslogdaemon
-Obsoletes:     klogd
-Obsoletes:     msyslog
-Obsoletes:     syslog
+Conflicts:     klogd
+Conflicts:     msyslog
+Conflicts:     syslog
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-syslog-ng is a syslogd replacement for unix and unix-like systems. It
+syslog-ng is a syslogd replacement for Unix and Unix-like systems. It
 has been tested on Solaris, BSDi and Linux, and were found to run
 reliably. syslog-ng gives you a much enhanced configuration scheme,
 which lets you filter messages based on not only priority/facility
@@ -59,7 +59,7 @@ modification on the line.
 
 %description -l pl.UTF-8
 Syslog-ng jest zamiennikiem dla standardowo używanych programów typu
-sysklog. Działa w systemie SunOS, BSD, Linux. Daje znacznie większe
+syslog. Działa w systemie SunOS, BSD, Linux. Daje znacznie większe
 możliwości logowania i kontrolowania zbieranych informacji.
 
 %description -l pt_BR.UTF-8
@@ -71,6 +71,7 @@ facility/prioridade como o syslog original.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__tar} xzf doc/reference/syslog-ng.html.tar.gz
 
@@ -89,7 +90,7 @@ facility/prioridade como o syslog original.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{sysconfig,logrotate.d,rc.d/init.d},%{_sysconfdir}/syslog-ng} \
-       $RPM_BUILD_ROOT/var/log
+       $RPM_BUILD_ROOT/var/{log,lib/%{name}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -133,7 +134,10 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/syslog-ng.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/syslog-ng
 %attr(754,root,root) /etc/rc.d/init.d/syslog-ng
+%attr(755,root,root) %{_bindir}/loggen
 %attr(755,root,root) %{_sbindir}/syslog-ng
-%{_mandir}/man[58]/*
+%dir %{_var}/lib/%{name}
+%{_mandir}/man5/syslog-ng.conf.5*
+%{_mandir}/man8/syslog-ng.8*
 
 %attr(640,root,root) %ghost /var/log/*