- added conditional(mysql) BuildRequires: zlib-devel

[packages/courier-imap.git] / courier-imap.spec

diff --git a/courier-imap.spec b/courier-imap.spec
index a3a2884fc7c43fc57ed38bbf1da09376c61c79df..86eceae2eb5574985b2af63f7df66a42ca1dc28f 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -6,8 +6,8 @@
 Summary:       Courier-IMAP server
 Summary(pl):   Serwer Courier-IMAP
 Name:          courier-imap
-Version:       1.3.13
-Release:       10
+Version:       1.4.1
+Release:       2
 License:       GPL
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
@@ -25,10 +25,12 @@ Patch0:             ftp://ftp.pld.org.pl/people/siefca/patches/courier/%{name}-myownquery.p
 URL:           http://www.inter7.com/courierimap/
 %{!?_without_postgresql:BuildRequires: postgresql-devel}
 %{!?_without_mysql:BuildRequires:      mysql-devel}
+%{!?_without_mysql:BuildRequires:      zlib-devel}
 %{!?_without_ldap:BuildRequires:       openldap-devel}
 BuildRequires: gdbm-devel
 BuildRequires: libstdc++-devel
 BuildRequires: openssl-devel
+BuildRequires:  kernel-headers
 Provides:      imapdaemon
 Prereq:                %{name}-common = %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -127,6 +129,7 @@ Group:              Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
 Prereq:                %{name}-common = %{version}
+Requires:      zlib
 
 %description authmysql
 This package provides MySQL authentication for Courier IMAP.
@@ -202,7 +205,8 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/*db \
 mv -f $RPM_BUILD_ROOT%{_datadir}/mk*cert \
        $RPM_BUILD_ROOT%{_sbindir}
 
-imap/html2man.pl tcpd/couriertls.html > $RPM_BUILD_ROOT%{_mandir}/man8/couriertls.8
+mv -f tcpd/couriertls.1 $RPM_BUILD_ROOT%{_mandir}/man8/couriertls.1
+mv -f imap/courierpop3d.8 $RPM_BUILD_ROOT%{_mandir}/man8/courierpop3d.8
 
 echo ".so authlib.8"   >$RPM_BUILD_ROOT%{_mandir}/man8/authcram.8
 echo ".so authlib.8"   >$RPM_BUILD_ROOT%{_mandir}/man8/authpam.8
@@ -347,8 +351,8 @@ fi
 %attr(755,root,root) %{_libexecdir}/logger
 %attr(755,root,root) %{_libexecdir}/makedatprog
 %{_mandir}/man8/auth[cdpsuv]*
-%{_mandir}/man8/authlib*
-%{_mandir}/man8/couriert*
+%{_mandir}/man7/authlib*
+%{_mandir}/man1/couriert*
 %{_mandir}/man8/mk*
 
 %files userdb
@@ -382,6 +386,7 @@ fi
 %attr(755,root,root) %{_sbindir}/mkpop3dcert
 %attr(755,root,root) %{_sbindir}/pop3login
 %{_sysconfdir}/pop3d.cnf
+%{_mandir}/man8/courierpop*
 
 %if %{?_without_ldap:0}%{!?_without_ldap:1}
 %files authldap