SPECS: proftpd.spec - fix unnecessary merge

[baggins]

Author: baggins                      Date: Thu Mar 22 17:22:47 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix unnecessary merge

---- Files affected:
SPECS:
   proftpd.spec (1.236 -> 1.237) 

---- Diffs:

================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.236 SPECS/proftpd.spec:1.237
--- SPECS/proftpd.spec:1.236	Thu Mar 22 18:20:37 2007
+++ SPECS/proftpd.spec	Thu Mar 22 18:22:41 2007
@@ -507,7 +507,6 @@
 
 :> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers.default
 :> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers
-:> $RPM_BUILD_ROOT/var/log/xferlog
 
 # only for -inetd package?
 ln -sf proftpd $RPM_BUILD_ROOT%{_sbindir}/ftpd
@@ -525,7 +524,6 @@
 
 %post common
 umask 027
-touch /var/log/xferlog
 awk -F: '{ if (($3 < 500) && ($1 != "ftp")) print $1; }' < /etc/passwd >> %{_sysconfdir}/ftpusers.default
 if [ ! -f %{_sysconfdir}/ftpusers ]; then
 	cp -f %{_sysconfdir}/ftpusers.default %{_sysconfdir}/ftpusers
@@ -772,6 +770,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.237  2007/03/22 17:22:41  baggins
+- fix unnecessary merge
+
 Revision 1.236  2007/03/22 17:20:37  baggins
 - up to 1.3.1rc2
 
================================================================

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