diff -r 722f9e17a5c4 -r a90827bdc01a imap/imap.spec
--- a/imap/imap.spec	Fri Apr 24 15:32:30 2009 +0200
+++ b/imap/imap.spec	Fri Apr 24 15:35:56 2009 +0200
@@ -37,20 +37,17 @@
 Group:        Mail
 License:      University of Washington's Free-Fork License
 Version:      %{V_here}
-Release:      20081218
+Release:      20090418
 
 #   package options
 %option       with_ssl      yes
 %option       with_pam      no
 %option       with_daemons  no
 %option       with_mbxdef   no
-%option       with_annotate no
 
 #   list of sources
-#   (ping p@rdus.de if the Kolab patches are unavailable for the latest IMAP version)
 Source0:      ftp://ftp.cac.washington.edu/imap/imap-%{V_real}.tar.Z
 Patch0:       imap.patch
-Patch1:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/imap/KOLAB_imap-c-client_2006j2_Annotations.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -85,9 +82,6 @@
 %prep
     %setup -q -n imap-%{V_subdir}
     %patch -p0
-%if "%{with_annotate}" == "yes"
-    %patch -p1 -P 1
-%endif
 
 %build
     mflags="%{l_mflags}"
@@ -108,6 +102,9 @@
 %if "%{with_ssl}" == "yes"
     cflags="%{l_cppflags openssl .} $cflags"
     mflags="$mflags SSLDIR=%{l_prefix}/etc/openssl"
+    mflags="$mflags SSLCERTS=%{l_prefix}/etc/imap/certs"
+    mflags="$mflags SSLINCLUDE=%{l_prefix}/include"
+    mflags="$mflags SSLLIB=%{l_prefix}/lib"
 %else
     mflags="$mflags SSLTYPE=none"
 %endif
@@ -136,6 +133,10 @@
     rm -f $RPM_BUILD_ROOT%{l_prefix}/include/imap/os_*.h
     %{l_shtool} install -c -m 644 c-client/c-client.a \
         $RPM_BUILD_ROOT%{l_prefix}/lib/libimap.a
+%if "%{with_ssl}" == "yes"
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/imap/certs
+%endif
 %if "%{with_daemons}" == "yes"
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/bin \