X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=syslog-ng.spec;h=5d2c1e75b93cfae963a721146eaedee6092c9c85;hb=c67bc54f5fc221f45d25a9b015523cad1396bfbf;hp=a0d305eee5df7f3b04cfa38f22a8f219cdc7d3f1;hpb=c8aca4b90c8a5183e92676bd6c0c1165fa2c005e;p=packages%2Fsyslog-ng.git

diff --git a/syslog-ng.spec b/syslog-ng.spec
index a0d305e..5d2c1e7 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -1,30 +1,36 @@
+%define		mainver		1.9
+%define		minorver	9
+
 Summary:	Syslog-ng - new generation of the system logger
 Summary(pl):	Syslog-ng - zamiennik syskloga
 Summary(pt_BR):	Daemon de log nova geração
 Name:		syslog-ng
-Version:	1.4.15
-Release:	4
+Version:	%{mainver}.%{minorver}
+Release:	1
 License:	GPL
 Group:		Daemons
-Source0:	http://www.balabit.hu/downloads/syslog-ng/1.4/%{name}-%{version}.tar.gz
+Source0:	http://www.balabit.com/downloads/syslog-ng/%{mainver}/src/%{name}-%{version}.tar.gz
+# Source0-md5:	76dfb7ea910d1b033031aca2f40bf723
 Source1:	%{name}.init
 Source2:	%{name}.conf
 Source3:	%{name}.logrotate
-Patch0:		%{name}-autoconf.patch
-Patch1:		%{name}-notestlibolver.patch
-Patch2:		%{name}-ac25x.patch
-URL:		http://www.balabit.hu/products/syslog-ng/
-BuildRequires:	autoconf
+Patch0:		%{name}-link.patch
+URL:		http://www.balabit.com/products/syslog_ng/
+BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
+BuildRequires:	eventlog-devel
 BuildRequires:	flex
-BuildRequires:	libol-static >= 0.2.21
-PreReq:		rc-scripts >= 0.2.0
+BuildRequires:	glib2-static
+BuildRequires:	libwrap-devel
+Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
-Requires:	fileutils
 Requires:	logrotate
 Requires:	psmisc >= 20.1
+Requires:	rc-scripts >= 0.2.0
 Provides:	syslogdaemon
 Obsoletes:	syslog
+Obsoletes:	msyslog
+Obsoletes:	klogd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,35 +58,40 @@ facility/prioridade como o syslog original.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
-%patch2 -p1
 
 %build
-rm -f missing
-aclocal
+%{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+	--sysconfdir=%{_sysconfdir}/syslog-ng
+
 %{__make}
 
+tar zxvf doc/reference/syslog-ng.html.tar.gz
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,rc.d/init.d},%{_sysconfdir}/syslog-ng} \
-	$RPM_BUILD_ROOT/var/log/{,archiv}/{mail,news}
+	$RPM_BUILD_ROOT/var/log/
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 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/etc/logrotate.d/syslog-ng
 
-> $RPM_BUILD_ROOT/var/log/syslog
+for n in debug kernel maillog messages secure syslog user spooler lpr daemon
+do
+	> $RPM_BUILD_ROOT/var/log/$n
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-for n in /var/log/{cron,daemon,debug,kernel,lpr,maillog,messages,ppp,secure,spooler,syslog,user,mail/{info,warn,err}}
+for n in /var/log/{cron,daemon,debug,kernel,lpr,maillog,messages,ppp,secure,spooler,syslog,user}
 do
 	[ -f $n ] && continue
 	touch $n
@@ -89,13 +100,10 @@ done
 
 /sbin/chkconfig --add syslog-ng
 if [ -f /var/lock/subsys/syslog-ng ]; then
-	/etc/rc.d/init.d/syslog-ng restart >/dev/null 2>&1
+	/etc/rc.d/init.d/syslog-ng restart >&2
 else
 	echo "Run \"/etc/rc.d/init.d/syslog-ng start\" to start syslog-ng daemon."
 fi
-if [ -f /var/lock/subsys/klogd ]; then
-	/etc/rc.d/init.d/klogd restart 1>&2
-fi
 
 %preun
 if [ "$1" = "0" ]; then
@@ -107,15 +115,13 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc/syslog-ng.conf.{demo,sample} doc/sgml/syslog-ng.txt*
+%doc doc/examples/syslog-ng.conf.sample doc/reference/syslog-ng.txt* contrib/syslog-ng.conf.{doc,RedHat}
+%doc syslog-ng.html/*
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/syslog-ng/syslog-ng.conf
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/syslog-ng
+%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) %{_sbindir}/syslog-ng
 %{_mandir}/man[58]/*
 
-%attr(640,root,root) %ghost /var/log/syslog
-%attr(750,root,root) %ghost /var/log/news
-%attr(750,root,root) %dir /var/log/mail
-%attr(750,root,root) %dir /var/log/archiv/mail
+%attr(640,root,root) %ghost /var/log/*