X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=syslog-ng.spec;h=c534e0e1bc3a4ef5bba423abcd9075b8626b611b;hb=a2cd5504e5e08bbdc7e83a4d23e16a1aebc089fb;hp=c84e76d38ff81d826f951bfc5c077f1c346169ee;hpb=18a2d4eac3e43cd72c6076a261546fb721ecc5ca;p=packages%2Fsyslog-ng.git

diff --git a/syslog-ng.spec b/syslog-ng.spec
index c84e76d..c534e0e 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -2,18 +2,20 @@ Summary:	Syslog-ng - new generation fo the system logger
 Summary(pl):	Syslog-ng - zamiennik sysklog'a
 Name:		syslog-ng
 Version:	1.4.5
-Release:	1
+Release:	6
 License:	GPL
 Group:		Daemons
 Group(pl):	Serwery
 Source0:	http://www.balabit.hu/downloads/syslog-ng/source/%{name}-%{version}.tar.gz
-Source1:	syslog-ng.init
-Source2:	syslog-ng.conf
-Patch0:		syslog-ng-autoconf.patch
+Source1:	%{name}.init
+Source2:	%{name}.conf
+Source3:	%{name}.logrotate
+Patch0:		%{name}-autoconf.patch
 URL:		http://www.balabit.hu/products/syslog-ng/
 BuildRequires:	libol-static >= 0.2.16
 BuildRequires:	flex
 Requires:	rc-scripts >= 0.2.0
+Requires:	logrotate
 Provides:	syslogdaemon
 Obsoletes:	syslog
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -21,14 +23,15 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_sysconfdir	/etc
 
 %description
-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 pairs, but also on
-message content. You can use regexps to direct log stream to different
-destinations. A destination can be anything from a simple file to a network
-connection. syslog-ng supports TCP logforwarding, together with hashing to
-prevent unauthorized modification on the line.
+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
+pairs, but also on message content. You can use regexps to direct log
+stream to different destinations. A destination can be anything from a
+simple file to a network connection. syslog-ng supports TCP
+logforwarding, together with hashing to prevent unauthorized
+modification on the line.
 
 %description -l pl
 Syslog-ng jest zamiennikiem dla standartowo u¿ywanych programów typu
@@ -49,13 +52,14 @@ LDFLAGS="-s"; export LDFLAGS
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/syslog-ng} \
-	$RPM_BUILD_ROOT/var/log/news
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/{syslog-ng,logrotate.d}} \
+	$RPM_BUILD_ROOT/var/log/{news,mail}
 
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/syslog-ng
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/syslog-ng.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/syslog-ng
 
 gzip -9nf doc/syslog-ng.conf.{demo,sample} doc/sgml/syslog-ng.txt \
 	$RPM_BUILD_ROOT%{_mandir}/man[58]/*
@@ -63,7 +67,7 @@ gzip -9nf doc/syslog-ng.conf.{demo,sample} doc/sgml/syslog-ng.txt \
 touch $RPM_BUILD_ROOT/var/log/syslog
 
 %post
-for n in /var/log/{auth.log,syslog,cron.log,daemon.log,kern.log,lpr.log,user.log,uucp.log,ppp.log,mail.log,mail.info,mail.warn,mail.err,debug,messages}
+for n in /var/log/{kernel,messages,secure,maillog,spooler,debug,cron,syslog,daemon,lpr,user,ppp,mail/{info,warn,err}}
 do
 	[ -f $n ] && continue
 	touch $n
@@ -71,15 +75,15 @@ do
 done
 
 /sbin/chkconfig --add syslog-ng
-if [ -f /var/lock/subsys/ ]; then
-	/etc/rc.d/init.d/syslog restart &>/dev/null
+if [ -f /var/lock/subsys/syslog-ng ]; then
+	/etc/rc.d/init.d/syslog-ng restart &>/dev/null
 else
 	echo "Run \"/etc/rc.d/init.d/syslog-ng start\" to start syslog-ng daemon."
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/ ]; then
+	if [ -f /var/lock/subsys/syslog-ng ]; then
 		/etc/rc.d/init.d/syslog-ng stop >&2
 	fi
 	/sbin/chkconfig --del syslog-ng
@@ -93,8 +97,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*.gz doc/sgml/syslog-ng.txt*
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng
 %attr(640,root,root) %config %verify(not size mtime md5) %{_sysconfdir}/syslog-ng/syslog-ng.conf
+%attr(640,root,root) %config %verify(not size mtime md5) %{_sysconfdir}/logrotate.d/syslog-ng
 %attr(754,root,root) /etc/rc.d/init.d/syslog-ng
 %attr(755,root,root) %{_sbindir}/syslog-ng
-
 %{_mandir}/man[58]/*
-%attr(640,root,root) %config(noreplace) %verify(not mtime md5 size) /var/log/*
+
+%attr(640,root,root) %ghost /var/log/syslog
+%attr(750,root,root) %ghost /var/log/news
+%attr(750,root,root) %dir /var/log/mail