- rediff

[packages/proftpd.git] / proftpd.spec

diff --git a/proftpd.spec b/proftpd.spec
index 7507f885088e0d3f452b48bf9133d35f066ac10f..78f068e136514c3d3aced82583936b0c397e5654 100644 (file)
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -1,17 +1,18 @@
 # TODO
 # - mod_caps uses uname -r for detection
+# - don't use internal libltdl
 #
 # Conditional build:
 %bcond_without pam             # disable PAM support
 %bcond_without ipv6            # disable IPv6 and TCPD support
 %bcond_without ssl             # disbale TLS/SSL support
-%bcond_without ldap            # enable LDAP support
-%bcond_without mysql           # enable MySQL support
-%bcond_without pgsql           # enable PostgreSQL support
-%bcond_without quotafile       # enable quota file support
-%bcond_without quotaldap       # enable quota ldap support
-%bcond_without quotamysql      # enable quota mysql support
-%bcond_without quotapgsql      # enable quota pgsql support
+%bcond_without ldap            # disable LDAP support
+%bcond_without mysql           # disable MySQL support
+%bcond_without pgsql           # disable PostgreSQL support
+%bcond_without quotafile       # disable quota file support
+%bcond_without quotaldap       # disable quota ldap support
+%bcond_without quotamysql      # disable quota mysql support
+%bcond_without quotapgsql      # disable quota pgsql support
 #
 Summary:       PROfessional FTP Daemon with apache-like configuration syntax
 Summary(es.UTF-8):     Servidor FTP profesional, con sintaxis de configuración semejante a la del apache
@@ -19,13 +20,13 @@ Summary(pl.UTF-8):  PROfesionalny serwer FTP
 Summary(pt_BR.UTF-8):  Servidor FTP profissional, com sintaxe de configuração semelhante à do apache
 Summary(zh_CN.UTF-8):  易于管理的,安全的 FTP 服务器
 Name:          proftpd
-Version:       1.3.1rc2
+Version:       1.3.1
 Release:       1
-Epoch:         1
+Epoch:         2
 License:       GPL v2+
 Group:         Daemons
 Source0:       ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.bz2
-# Source0-md5: b117abb8fa7df8bc6d5e2ee85d97b4e0
+# Source0-md5: 175958df8de92d5209b7b1e2e23a5a28
 Source1:       %{name}.conf
 Source3:       ftp.pamd
 Source4:       %{name}.inetd
@@ -45,6 +46,7 @@ Patch5:               %{name}-pool.patch
 URL:           http://www.proftpd.org/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: libstdc++-devel
 BuildRequires: libwrap-devel
 %if %{with mysql} || %{with quotamysql}
 BuildRequires: mysql-devel
@@ -149,6 +151,7 @@ Obsoletes:  ftpd-BSD
 Obsoletes:     ftpserver
 Obsoletes:     glftpd
 Obsoletes:     heimdal-ftpd
+Obsoletes:     krb5-ftpd
 Obsoletes:     linux-ftpd
 Obsoletes:     muddleftpd
 Obsoletes:     proftpd-standalone
@@ -184,6 +187,7 @@ Obsoletes:  ftpd-BSD
 Obsoletes:     ftpserver
 Obsoletes:     glftpd
 Obsoletes:     heimdal-ftpd
+Obsoletes:     krb5-ftpd
 Obsoletes:     linux-ftpd
 Obsoletes:     muddleftpd
 Obsoletes:     proftpd-inetd
@@ -641,7 +645,7 @@ sed -i -e '
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %ghost %{_sysconfdir}/ftpusers
 %attr(640,root,root) %{_sysconfdir}/ftpusers.default
 %dir %attr(750,root,root) %{_sysconfdir}/conf.d
-%attr(640,root,root) %ghost /var/log/*
+#%attr(640,root,root) %ghost /var/log/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_libdir}/%{name}