- cosmetics,

- typo,
- stale logrotate.d prefix,
- touch replaced with >,
- new %doc.

Changed files:
    syslog-ng.spec -> 1.62

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 658fb0c92b2380e75d84b12f6002463919330dd2..0f7968066419665d769f922506b9df18658f5e7c 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -18,17 +18,15 @@ BuildRequires:      autoconf
 BuildRequires: automake
 BuildRequires: flex
 BuildRequires: libol-static >= 0.2.21
-Prereq:                rc-scripts >= 0.2.0
+PreReq:                rc-scripts >= 0.2.0
 Requires(post,preun):  /sbin/chkconfig
-Requires:      logrotate
 Requires:      fileutils
+Requires:      logrotate
 Requires:      psmisc >= 20.1
 Provides:      syslogdaemon
 Obsoletes:     syslog
 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
@@ -41,7 +39,7 @@ 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
+Syslog-ng jest zamiennikiem dla standardowo u¿ywanych programów typu
 sysklog. Dzia³a w systemie SunOS, BSD, Linux. Daje znacznie wiêksze
 mo¿liwo¶ci logowania i kontrolowania zbieranych informacji.
 
@@ -67,27 +65,25 @@ aclocal
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_sysconfdir}/{syslog-ng,logrotate.d}} \
-       $RPM_BUILD_ROOT/var/log/{archiv,}/{news,mail}
+install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,rc.d/init.d},%{_sysconfdir}/syslog-ng} \
+       $RPM_BUILD_ROOT/var/log/{,archiv}/{mail,news}
 
 %{__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 \
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/syslog-ng
 
-touch $RPM_BUILD_ROOT/var/log/syslog
+> $RPM_BUILD_ROOT/var/log/syslog
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-for n in /var/log/{kernel,messages,secure,maillog,spooler,debug,cron,syslog,daemon,lpr,user,ppp,mail/{info,warn,err}}
+for n in /var/log/{cron,daemon,debug,kernel,lpr,maillog,messages,ppp,secure,spooler,syslog,user,mail/{info,warn,err}}
 do
        [ -f $n ] && continue
-       touch $n
+       > $n
        chmod 640 $n
 done
 
@@ -111,10 +107,10 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc/*.gz doc/sgml/syslog-ng.txt*
+%doc doc/syslog-ng.conf.{demo,sample} doc/sgml/syslog-ng.txt*
 %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) %{_sysconfdir}/logrotate.d/syslog-ng
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /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]/*