- updated to 4.10.0

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

diff --git a/courier-imap.spec b/courier-imap.spec
index f518c4a08dc266cacea9f832181d35d8846b660f..66f13a69999242b8841a3155c7e8d41f23010093 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -2,18 +2,21 @@
 # - put imap-ssl and pop3-ssl to separate packages - some want to have
 #   ssl-only system (or non-ssl only system)
 #   see also http://thread.gmane.org/gmane.linux.pld.devel.english/2509/focus=2509
+# - fix manpages:
+#    [set $man.base.url.for.relative.links]/maildirquota.html
 #
+# Conditional build:
 %bcond_with    toplevel        # Allow toplevel folders. More info: http://www.ricky-chan.co.uk/courier/
-#
+
 Summary:       Courier-IMAP server
 Summary(pl.UTF-8):     Serwer Courier-IMAP
 Name:          courier-imap
-Version:       4.1.2
-Release:       2
+Version:       4.10.0
+Release:       1
 License:       GPL
 Group:         Networking/Daemons
-Source0:       http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5: e4a1c75992cc85ba10f719e98f6df0ff
+Source0:       http://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
+# Source0-md5: 2f95c99b9ad1380b9f3ac733ccd741a2
 Source1:       %{name}.init
 Source2:       %{name}-ssl.init
 Source3:       %{name}-pop3.init
@@ -25,15 +28,18 @@ Patch1:             %{name}-certsdir.patch
 Patch2:                %{name}-maildir.patch
 Patch3:                %{name}-toplevel.patch
 Patch4:                %{name}-drop-makedat.patch
-Patch5:                %{name}-link.patch
 URL:           http://www.courier-mta.org/imap/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake
-BuildRequires: courier-authlib-devel >= 0.59
+BuildRequires: courier-authlib-devel >= 0.61
 BuildRequires: db-devel
-BuildRequires: fam-devel
+BuildRequires: gdbm-devel
+BuildRequires: gnet-devel
+BuildRequires: libidn-devel
 BuildRequires: libstdc++-devel
+BuildRequires: libtool
 BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: pkgconfig
 BuildRequires: procps
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
@@ -105,7 +111,7 @@ formacie Maildir.
 %package pop3
 Summary:       Courier-IMAP POP3 Server
 Summary(pl.UTF-8):     Serwer Courier-IMAP POP3
-Group:         Networking/Daemons
+Group:         Networking/Daemons/POP3
 Requires:      %{name}-common = %{version}-%{release}
 Requires:      pam >= 0.79.0
 Provides:      pop3daemon
@@ -130,7 +136,6 @@ Courier-IMAP POP3 jest serwerem POP3 dla skrzynek pocztowych Maildir.
 %patch3 -p1
 %endif
 %patch4 -p1
-%patch5 -p1
 
 install %{SOURCE1} courier-imap.in
 install %{SOURCE2} courier-imap-ssl.in
@@ -139,7 +144,6 @@ install %{SOURCE4} courier-pop3-ssl.in
 rm -f makedat/configure.in
 
 %build
-
 # Change Makefile.am files and force recreate Makefile.in's.
 find -type f -a '(' -name configure.in -o -name configure.ac ')' | while read FILE; do
        cd "$(dirname "$FILE")"
@@ -151,7 +155,9 @@ find -type f -a '(' -name configure.in -o -name configure.ac ')' | while read FI
        %{__libtoolize}
        %{__aclocal}
        %{__autoconf}
-       %{__autoheader}
+       if grep -q AC_CONFIG_HEADER configure.in; then
+               %{__autoheader}
+       fi
        %{__automake}
 
        cd -
@@ -164,7 +170,7 @@ done
        --with-certsdir=%{_certsdir} \
        --with-mailer=/usr/lib/sendmail
 
-%{__make}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -173,23 +179,23 @@ install -d $RPM_BUILD_ROOT{/etc/{pam.d,rc.d/init.d,security},%{_certsdir}}
 %{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install courier-imap $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-imap
-install courier-imap-ssl $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-imap-ssl
-install courier-pop3 $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-pop3
-install courier-pop3-ssl $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-pop3-ssl
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/imap
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/pop3
+install -p courier-imap $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-imap
+install -p courier-imap-ssl $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-imap-ssl
+install -p courier-pop3 $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-pop3
+install -p courier-pop3-ssl $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-pop3-ssl
+cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/imap
+cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/pop3
 
 rm -rf $RPM_BUILD_ROOT%{_sbindir}/mk*cert
 
-install imap/README README.imap
-install imap/ChangeLog ChangeLog
-install maildir/README.maildirquota.txt README.maildirquota
+cp -af imap/README README.imap
+cp -af imap/ChangeLog ChangeLog
+cp -af maildir/README.maildirquota.txt README.maildirquota
 
 mv -f $RPM_BUILD_ROOT%{_datadir}/mk*cert $RPM_BUILD_ROOT%{_sbindir}
 
-install tcpd/couriertls.1 $RPM_BUILD_ROOT%{_mandir}/man8/couriertls.8
-install imap/courierpop3d.8 $RPM_BUILD_ROOT%{_mandir}/man8/courierpop3d.8
+cp -a tcpd/couriertls.1 $RPM_BUILD_ROOT%{_mandir}/man8/couriertls.8
+cp -a imap/courierpop3d.8 $RPM_BUILD_ROOT%{_mandir}/man8/courierpop3d.8
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.{pop3,imap}
 touch $RPM_BUILD_ROOT%{_sysconfdir}/shared/index