SPECS: syslog-ng2.spec - revert insanity

[arekm]

Author: arekm                        Date: Tue Mar 31 13:59:51 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- revert insanity

---- Files affected:
SPECS:
   syslog-ng2.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/syslog-ng2.spec
diff -u SPECS/syslog-ng2.spec:1.2 SPECS/syslog-ng2.spec:1.3
--- SPECS/syslog-ng2.spec:1.2	Tue Mar 31 15:56:12 2009
+++ SPECS/syslog-ng2.spec	Tue Mar 31 15:59:46 2009
@@ -8,18 +8,18 @@
 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
+Name:		syslog-ng2
 Version:	2.0.10
 Release:	2
 License:	GPL v2
 Group:		Daemons
-Source0:	http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/%{name}-%{version}.tar.gz
+Source0:	http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/syslog-ng-%{version}.tar.gz
 # Source0-md5:	3f96ccf13dda0b9e150e511bcffde795
-Source1:	%{pkg_name}.init
-Source2:	%{pkg_name}.conf
-Source3:	%{pkg_name}.logrotate
-Patch0:		%{pkg_name}-link.patch
-Patch1:		%{pkg_name}-datadir.patch
+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
@@ -47,9 +47,10 @@
 Conflicts:	klogd
 Conflicts:	msyslog
 Conflicts:	syslog
+Conflicts:	syslog-ng
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%description -n %{pkg_name}
+%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,
@@ -60,19 +61,19 @@
 logforwarding, together with hashing to prevent unauthorized
 modification on the line.
 
-%description -n %{pkg_name} -l pl.UTF-8
+%description -l pl.UTF-8
 Syslog-ng jest zamiennikiem dla standardowo używanych programów typu
 syslog. Działa w systemie SunOS, BSD, Linux. Daje znacznie większe
 możliwości logowania i kontrolowania zbieranych informacji.
 
-%description -n %{pkg_name} -l pt_BR.UTF-8
+%description -l pt_BR.UTF-8
 Syslog-ng é um substituto para o syslog tradicional, mas com diversas
 melhorias, como, por exemplo, a habilidade de filtrar mensagens de log
 por seu conteúdo (usando expressões regulares) e não apenas pelo par
 facility/prioridade como o syslog original.
 
 %prep
-%setup -q
+%setup -q -n syslog-ng-%{version}
 %patch0 -p1
 %patch1 -p1
 
@@ -93,7 +94,7 @@
 %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,lib/%{name}}
+	$RPM_BUILD_ROOT/var/{log,lib/syslog-ng}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -106,7 +107,7 @@
 do
 	> $RPM_BUILD_ROOT/var/log/$n
 done
-touch $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+touch $RPM_BUILD_ROOT/etc/sysconfig/syslog-ng
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -128,19 +129,19 @@
 	/sbin/chkconfig --del syslog-ng
 fi
 
-%files -n %{pkg_name}
+%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}
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/syslog-ng
 %attr(750,root,root) %dir %{_sysconfdir}/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) %{_bindir}/loggen
 %attr(755,root,root) %{_sbindir}/syslog-ng
-%dir %{_var}/lib/%{name}
+%dir %{_var}/lib/syslog-ng
 %{_mandir}/man5/syslog-ng.conf.5*
 %{_mandir}/man8/syslog-ng.8*
 
@@ -152,6 +153,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/03/31 13:59:46  arekm
+- revert insanity
+
 Revision 1.2  2009/03/31 13:56:12  gotar
 - adjusted package name - this way should be less changes (or another?)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/syslog-ng2.spec?r1=1.2&r2=1.3&f=u