Author: glen Date: Sat Apr 29 11:03:16 2006 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- cleanups, always enable DSO
---- Files affected:
SPECS:
proftpd.spec (1.211.2.7 -> 1.211.2.8)
---- Diffs:
================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.211.2.7 SPECS/proftpd.spec:1.211.2.8
--- SPECS/proftpd.spec:1.211.2.7 Sat Apr 29 13:00:44 2006
+++ SPECS/proftpd.spec Sat Apr 29 13:03:11 2006
@@ -12,10 +12,7 @@
%bcond_without quotaldap # enable quota ldap support
%bcond_without quotamysql # enable quota mysql support
%bcond_without quotapgsql # enable quota pgsql support
-%bcond_without dso # enable DSO (available since 1.3.0)
%bcond_with linuxprivs # enable libcap support
-
-%define with_dso 1
#
Summary: PROfessional FTP Daemon with apache-like configuration syntax
Summary(es): Servidor FTP profesional, con sintaxis de configuración
semejante a la del apache
@@ -239,17 +236,17 @@
%{?with_mysql:mod_sql mod_sql_mysql}
%{?with_pgsql:mod_sql mod_sql_postgres}
"
-MODARG=$(echo $MODULES | tr ' ' '\n' | sort -u | xargs | tr ' ' ':')
+MODARG=$(echo $MODULES | tr ' ' '\n' | sort -u | xargs | tr ' ' ':')
%configure \
--enable-autoshadow \
- %{?with_dso:--enable-dso --with-shared=$MODARG} \
- %{!?with_dso:--with-modules=$MODARG} \
- %{?with_ipv6:--enable-ipv6} \
- %{!?with_ssl:--disable-tls} \
--enable-ctrls \
- --enable-sendfile \
+ --enable-dso \
--enable-facl
+ %{?with_ipv6:--enable-ipv6} \
+ --enable-sendfile \
+ %{!?with_ssl:--disable-tls} \
+ --with-shared=$MODARG \
%{__make}
@@ -380,31 +377,21 @@
%doc README README.LDAP README.PAM README.capabilities README.classes
README.controls README.IPv6
%doc README.modules
%doc doc/*html
-#%doc doc/*html contrib/*.html
-
%attr(750,root,ftp) %dir %{_sysconfdir}
%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) %ghost /var/log/*
%{?with_pam:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime
size) /etc/pam.d/*}
-
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/security/blacklist.ftp
-
%attr(755,root,root) %{_bindir}/*
%attr(755,root,root) %{_sbindir}/*
-
-%if %{with dso}
%dir %{_libdir}/%{name}
%attr(755,root,root) %{_libdir}/%{name}/*.so
# works without .la. so don't include it?
#%{_libdir}/%{name}/*.la
-%endif
-
%dir /var/run/proftpd
-
%{_mandir}/man[18]/*
-
%dir /var/lib/ftp
%dir /var/lib/ftp/pub
%attr(711,ftp,ftp) %dir /var/lib/ftp/pub/Incoming
@@ -434,6 +421,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.211.2.8 2006/04/29 11:03:11 glen
+- cleanups, always enable DSO
+
Revision 1.211.2.7 2006/04/29 11:00:44 glen
- restore description for src.rpm
- kill duplicate description common -l pl
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.211.2.7&r2=1.211.2.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
