1.1 --- a/imap/imap.spec Fri Apr 24 15:32:30 2009 +0200
1.2 +++ b/imap/imap.spec Fri Apr 24 15:35:56 2009 +0200
1.3 @@ -37,20 +37,17 @@
1.4 Group: Mail
1.5 License: University of Washington's Free-Fork License
1.6 Version: %{V_here}
1.7 -Release: 20081218
1.8 +Release: 20090418
1.9
1.10 # package options
1.11 %option with_ssl yes
1.12 %option with_pam no
1.13 %option with_daemons no
1.14 %option with_mbxdef no
1.15 -%option with_annotate no
1.16
1.17 # list of sources
1.18 -# (ping p@rdus.de if the Kolab patches are unavailable for the latest IMAP version)
1.19 Source0: ftp://ftp.cac.washington.edu/imap/imap-%{V_real}.tar.Z
1.20 Patch0: imap.patch
1.21 -Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/imap/KOLAB_imap-c-client_2006j2_Annotations.patch
1.22
1.23 # build information
1.24 Prefix: %{l_prefix}
1.25 @@ -85,9 +82,6 @@
1.26 %prep
1.27 %setup -q -n imap-%{V_subdir}
1.28 %patch -p0
1.29 -%if "%{with_annotate}" == "yes"
1.30 - %patch -p1 -P 1
1.31 -%endif
1.32
1.33 %build
1.34 mflags="%{l_mflags}"
1.35 @@ -108,6 +102,9 @@
1.36 %if "%{with_ssl}" == "yes"
1.37 cflags="%{l_cppflags openssl .} $cflags"
1.38 mflags="$mflags SSLDIR=%{l_prefix}/etc/openssl"
1.39 + mflags="$mflags SSLCERTS=%{l_prefix}/etc/imap/certs"
1.40 + mflags="$mflags SSLINCLUDE=%{l_prefix}/include"
1.41 + mflags="$mflags SSLLIB=%{l_prefix}/lib"
1.42 %else
1.43 mflags="$mflags SSLTYPE=none"
1.44 %endif
1.45 @@ -136,6 +133,10 @@
1.46 rm -f $RPM_BUILD_ROOT%{l_prefix}/include/imap/os_*.h
1.47 %{l_shtool} install -c -m 644 c-client/c-client.a \
1.48 $RPM_BUILD_ROOT%{l_prefix}/lib/libimap.a
1.49 +%if "%{with_ssl}" == "yes"
1.50 + %{l_shtool} mkdir -f -p -m 755 \
1.51 + $RPM_BUILD_ROOT%{l_prefix}/etc/imap/certs
1.52 +%endif
1.53 %if "%{with_daemons}" == "yes"
1.54 %{l_shtool} mkdir -f -p -m 755 \
1.55 $RPM_BUILD_ROOT%{l_prefix}/bin \
