- rel 4

[packages/proftpd.git] / proftpd.spec

diff --git a/proftpd.spec b/proftpd.spec
index 95a61cf23dcfe74c4a091cabee4e5cdaba6ab130..d5954c8b0e77bc2d0c7de1ca8a10e044e8c7f382 100644 (file)
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -1,5 +1,6 @@
 # TODO
 # - mod_caps uses uname -r for detection
+# - don't use internal libltdl
 #
 # Conditional build:
 %bcond_without pam             # disable PAM support
@@ -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
-Release:       1
-Epoch:         1
+Version:       1.3.1
+Release:       4
+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
@@ -207,6 +209,7 @@ standalone.
 Summary:       Header files ProFTPD
 Summary(pl.UTF-8):     Pliki nagłówkowe ProFTPD
 Group:         Development/Libraries
+Requires:      acl-devel
 
 %description devel
 This is the package containing the header files for ProFTPD.
@@ -598,40 +601,6 @@ fi
 %module_scripts mod_tls
 %module_scripts mod_wrap
 
-%triggerpostun inetd -- %{name}-inetd <= 1:1.2.10
-echo "Changing deprecated config options"
-cp -f %{_sysconfdir}/proftpd.conf{,.rpmorig}
-sed -i -e '
-       s/AuthPAMAuthoritative\b/AuthPAM/
-       s/TCPDServiceName/TCPServiceName/
-       s/TlsRsaCertFile/TLSRSACertificateFile/
-       s/TlsRsaKeyFile/TLSRSACertificateKeyFile/
-       s/TlsDsaCertFile/TLSDSACertificateFile/
-       s/TlsDsaKeyFile/TLSDSACertificateKeyFile/
-       s/TlsCrlFile/TLSCARevocationFile/
-       s/TlsDhParamFile/TLSDHParamFile/
-       s/TlsCipherList/TLSCipherSuite/
-       s/TlsCertsOk/TLSVerifyClient/
-       /UseTCPD/d
-' %{_sysconfdir}/proftpd.conf
-
-%triggerpostun standalone -- %{name}-standalone <= 1:1.2.10
-echo "Changing deprecated config options"
-cp -f %{_sysconfdir}/proftpd.conf{,.rpmorig}
-sed -i -e '
-       s/AuthPAMAuthoritative\b/AuthPAM/
-       s/TCPDServiceName/TCPServiceName/
-       s/TlsRsaCertFile/TLSRSACertificateFile/
-       s/TlsRsaKeyFile/TLSRSACertificateKeyFile/
-       s/TlsDsaCertFile/TLSDSACertificateFile/
-       s/TlsDsaKeyFile/TLSDSACertificateKeyFile/
-       s/TlsCrlFile/TLSCARevocationFile/
-       s/TlsDhParamFile/TLSDHParamFile/
-       s/TlsCipherList/TLSCipherSuite/
-       s/TlsCertsOk/TLSVerifyClient/
-       /UseTCPD/d
-' %{_sysconfdir}/proftpd.conf
-
 %files common
 %defattr(644,root,root,755)
 %doc sample-configurations/*.conf CREDITS ChangeLog NEWS RELEASE_NOTES