SPECS (DEVEL): proftpd.spec - cleanups, typos

[glen]

Author: glen                         Date: Sat Apr 29 11:34:51 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- cleanups, typos

---- Files affected:
SPECS:
   proftpd.spec (1.211.2.10 -> 1.211.2.11) 

---- Diffs:

================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.211.2.10 SPECS/proftpd.spec:1.211.2.11
--- SPECS/proftpd.spec:1.211.2.10	Sat Apr 29 13:25:39 2006
+++ SPECS/proftpd.spec	Sat Apr 29 13:34:46 2006
@@ -21,7 +21,7 @@
 Summary(zh_CN):	Ň×ÓÚšÜŔíľÄ,°˛ČŤľÄ FTP ˇţÎńĆ÷
 Name:		proftpd
 Version:	1.3.0
-Release:	0.1
+Release:	0.2
 Epoch:		1
 License:	GPL v2+
 Group:		Daemons
@@ -200,7 +200,7 @@
 %prep
 %setup -q -a 8 -n %{name}-%{version}%{?_rc}
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1 CONFUSES mod_ls.c
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -238,7 +238,7 @@
 	--enable-autoshadow \
 	--enable-ctrls \
 	--enable-dso \
-	--enable-facl
+	--enable-facl \
 	%{?with_ipv6:--enable-ipv6} \
 	--enable-sendfile \
 	%{!?with_ssl:--disable-tls} \
@@ -251,15 +251,12 @@
 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}
 
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}
-install -d $RPM_BUILD_ROOT/var/run/proftpd
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	INSTALL_USER=%(id -u) \
 	INSTALL_GROUP=%(id -g)
 
-rm -f $RPM_BUILD_ROOT%{_sbindir}/in.proftpd
+rm $RPM_BUILD_ROOT%{_sbindir}/in.proftpd
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 %{?with_pam:install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/ftp}
@@ -274,17 +271,17 @@
 :> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers
 :> $RPM_BUILD_ROOT/var/log/xferlog
 
+# only for -inetd package?
 ln -sf proftpd $RPM_BUILD_ROOT%{_sbindir}/ftpd
 
 :> $RPM_BUILD_ROOT/etc/security/blacklist.ftp
 
-rm -f $RPM_BUILD_ROOT%{_mandir}/ftpusers-path.diff*
-
-%if %{with dso}
+install -d $RPM_BUILD_ROOT%{_libdir}/%{name}
 mv $RPM_BUILD_ROOT%{_libdir}/mod_* $RPM_BUILD_ROOT%{_libdir}/%{name}
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
-%endif
+
+rm -f $RPM_BUILD_ROOT%{_mandir}/ftpusers-path.diff*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -407,6 +404,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.211.2.11  2006/04/29 11:34:46  glen
+- cleanups, typos
+
 Revision 1.211.2.10  2006/04/29 11:25:39  glen
 - reviewed patches, clean duplicate BR
 
================================================================

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