This commit was manufactured by cvs2git to create tag 'auto-ti-syslog-ng-

2_0_10-2'.

Sprout from master 2007-12-08 07:38:01 UTC hawk <hawk@pld-linux.org> '- keep syslong-ng.persist file in /var/lib/syslog-ng instead of /var'
Cherrypick from master 2008-12-26 17:16:18 UTC Tomasz Pala <gotar@pld-linux.org> '- more %doc files':
    syslog-ng.spec -> 1.153

diff --git a/syslog-ng.spec b/syslog-ng.spec
index c01817f69ce5abe5b03b6c9abc84641142174646..4db2f08fa849471e4ee51514d9d69e2e6270f079 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -1,24 +1,24 @@
 #
+# TODO:        upgrade to 2.1 or 3.0.1
+#
 # Conditional build:
 %bcond_with    dynamic         # link dynamically with glib and eventlog
 #
-%define                mainver         2.0
-%define                minver          6
-
 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}
-Release:       1
+Version:       2.0.10
+Release:       2
 License:       GPL v2
 Group:         Daemons
-Source0:       http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/%{name}-%{version}.tar.gz
-# Source0-md5: 16fa7595834765537650b390e93fe5e7
+Source0:       http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/%{name}-%{version}.tar.gz
+# Source0-md5: 3f96ccf13dda0b9e150e511bcffde795
 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
@@ -49,7 +49,7 @@ 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
@@ -61,7 +61,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
@@ -73,6 +73,7 @@ facility/prioridade como o syslog original.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__tar} xzf doc/reference/syslog-ng.html.tar.gz
 
@@ -91,7 +92,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
@@ -128,6 +129,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS debian/syslog-ng.conf* contrib/{relogger.pl,syslog-ng.vim}
 %doc doc/examples/syslog-ng.conf.sample doc/reference/syslog-ng.txt* contrib/syslog-ng.conf.{doc,RedHat}
 %doc syslog-ng.html/*
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
@@ -135,7 +137,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/*