From d961c67f7e71d97b260fd79b5a9abebf912de159 Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Apr 06 2009 21:47:16 +0000
Subject: Update to 1.3.2 and include mod_wrap (#479813).


---

diff --git a/.cvsignore b/.cvsignore
index 802f5b3..56ab944 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-proftpd-1.3.2rc3.tar.bz2
+proftpd-1.3.2.tar.bz2
diff --git a/proftpd.spec b/proftpd.spec
index 592e70e..b8ffe2b 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -1,9 +1,9 @@
-%define prever rc3
+#define prever rc3
 
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.2
-Release: 0.4%{?prever:.%{prever}}%{?dist}
+Release: 1%{?prever:.%{prever}}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -23,7 +23,16 @@ Requires(preun): /sbin/service, /sbin/chkconfig
 Requires(postun): /sbin/service
 BuildRequires: pam-devel, ncurses-devel, pkgconfig
 BuildRequires: openssl-devel, krb5-devel, libacl-devel
-BuildRequires: openldap-devel, mysql-devel, zlib-devel, postgresql-devel
+BuildRequires: zlib-devel
+# On RHEL (up to 5 included), the devel part was still in tcp_wrappers
+%if 0%{?rhel} <= 5
+BuildRequires: tcp_wrappers
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
+BuildRequires: openldap-devel
+BuildRequires: mysql-devel
+BuildRequires: postgresql-devel
 Provides: ftpserver
 
 %description
@@ -84,7 +93,7 @@ Module to add PostgreSQL support to the ProFTPD FTP server.
     --with-libraries="%{_libdir}/mysql" \
     --with-includes="%{_includedir}/mysql" \
     --with-modules=mod_readme:mod_auth_pam:mod_tls \
-    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban
+    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap:mod_quotatab_sql:mod_ifsession:mod_ban:mod_wrap
 
 # It seems that with _smp_mflags -lsupp tries to get linked before being built
 # (as of 1.3.0a-4 F7/devel with koji, happened on F8 x86_64 and F7 ppc64)
@@ -167,6 +176,7 @@ fi
 %{_libexecdir}/proftpd/mod_quotatab.so
 %{_libexecdir}/proftpd/mod_quotatab_file.so
 %{_libexecdir}/proftpd/mod_sql.so
+%{_libexecdir}/proftpd/mod_wrap.so
 %exclude %{_libexecdir}/proftpd/*.a
 %exclude %{_libexecdir}/proftpd/*.la
 %{_sbindir}/*
@@ -197,7 +207,12 @@ fi
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-0.4.rc3
+* Mon Apr  6 2009 Matthias Saou <http://freshrpms.net/> 1.3.2-1
+- Update to 1.3.2.
+- Include mod_wrap (#479813).
+- Tried to include mod_wrap2* modules but build failed.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sat Jan 24 2009 Caolán McNamara 1.3.2-0.3.rc3
diff --git a/sources b/sources
index fac80a1..df40c72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ecfc2976aa6a5016bd4f4f6745aa3d4  proftpd-1.3.2rc3.tar.bz2
+89f5e31fc3d3e02b66424dfc6cc5892d  proftpd-1.3.2.tar.bz2