SPECS: proftpd.spec - removed logrotate; xferlog is rotated by sys...

[glen]

Author: glen                         Date: Wed Aug 10 20:41:07 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed logrotate; xferlog is rotated by syslog daemons
- other minor fixes

---- Files affected:
SPECS:
   proftpd.spec (1.209 -> 1.210) 

---- Diffs:

================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.209 SPECS/proftpd.spec:1.210
--- SPECS/proftpd.spec:1.209	Wed Aug 10 11:31:46 2005
+++ SPECS/proftpd.spec	Wed Aug 10 22:41:02 2005
@@ -22,14 +22,13 @@
 Summary(zh_CN):	Ň×ÓÚšÜŔíľÄ,°˛ČŤľÄ FTP ˇţÎńĆ÷
 Name:		proftpd
 Version:	1.2.10
-Release:	6
+Release:	6.2
 Epoch:		1
 License:	GPL v2+
 Group:		Daemons
 Source0:	ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.bz2
 # Source0-md5:	5feb4a7348e12faefc25e34fd92efdd6
 Source1:	%{name}.conf
-Source2:	%{name}.logrotate
 Source3:	ftp.pamd
 Source4:	%{name}.inetd
 Source5:	%{name}.sysconfig
@@ -101,7 +100,6 @@
 Group:		Daemons
 Requires(post):	awk
 Requires(post):	fileutils
-Requires:	logrotate
 %{?with_pam:Requires:	pam >= 0.79.0}
 Obsoletes:	proftpd < 0:1.2.2rc1-3
 
@@ -239,7 +237,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,security,sysconfig/rc-inetd,rc.d/init.d} \
+install -d $RPM_BUILD_ROOT/etc/{pam.d,security,sysconfig/rc-inetd,rc.d/init.d} \
 	$RPM_BUILD_ROOT/var/{lib/ftp/pub/Incoming,log}
 
 %{__make} install \
@@ -250,7 +248,6 @@
 rm -f $RPM_BUILD_ROOT%{_sbindir}/in.proftpd
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/ftpd
 %{?with_pam:install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/ftp}
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ftpd
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/proftpd
@@ -259,8 +256,6 @@
 
 bzip2 -dc %{SOURCE7} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
-mv -f contrib/README contrib/README.modules
-
 :> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers.default
 :> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers
 :> $RPM_BUILD_ROOT/var/log/xferlog
@@ -269,7 +264,7 @@
 
 :> $RPM_BUILD_ROOT/etc/security/blacklist.ftp
 
-rm -f %{_mandir}/ftpusers-path.diff*
+rm -f $RPM_BUILD_ROOT%{_mandir}/ftpusers-path.diff*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -363,7 +358,6 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %ghost %{_sysconfdir}/ftpusers
 %attr(640,root,root) %{_sysconfdir}/ftpusers.default
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
 %attr(640,root,root) %ghost /var/log/*
 %{?with_pam:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*}
 
@@ -403,6 +397,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.210  2005/08/10 20:41:02  glen
+- removed logrotate; xferlog is rotated by syslog daemons
+- other minor fixes
+
 Revision 1.209  2005/08/10 09:31:46  glen
 - adapterized
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.209&r2=1.210&f=u