1.1 --- a/dovecot/dovecot.spec Wed Feb 08 20:16:25 2012 +0200
1.2 +++ b/dovecot/dovecot.spec Tue Aug 28 18:52:55 2012 +0200
1.3 @@ -22,9 +22,9 @@
1.4 ##
1.5
1.6 # package version
1.7 -%define V_major 2.0
1.8 -%define V_minor 18
1.9 -%define V_pigeonhole 0.2.6
1.10 +%define V_major 2.1
1.11 +%define V_minor 9
1.12 +%define V_pigeonhole 0.3.1
1.13
1.14 # package information
1.15 Name: dovecot
1.16 @@ -37,7 +37,7 @@
1.17 Group: Mail
1.18 License: MIT+LGPL
1.19 Version: %{V_major}.%{V_minor}
1.20 -Release: 20120208
1.21 +Release: 20120800
1.22
1.23 # package options
1.24 %option with_fsl yes
1.25 @@ -57,10 +57,8 @@
1.26 Patch0: dovecot.patch
1.27
1.28 # build information
1.29 -Prefix: %{l_prefix}
1.30 -BuildRoot: %{l_buildroot}
1.31 -BuildPreReq: OpenPKG, openpkg >= 20060823
1.32 -PreReq: OpenPKG, openpkg >= 20060823, MTA, x509
1.33 +BuildPreReq: OpenPKG, openpkg >= 20100101, pkgconfig
1.34 +PreReq: OpenPKG, openpkg >= 20100101, MTA, x509
1.35 BuildPreReq: libiconv, openssl, zlib, bzip2
1.36 PreReq: libiconv, openssl, zlib, bzip2
1.37 %if "%{with_fsl}" == "yes"
1.38 @@ -91,8 +89,6 @@
1.39 BuildPreReq: sqlite
1.40 PreReq: sqlite
1.41 %endif
1.42 -AutoReq: no
1.43 -AutoReqProv: no
1.44
1.45 %description
1.46 Dovecot is an Open Source IMAP and POP3 server, written with
1.47 @@ -127,17 +123,18 @@
1.48 src/lib-lda/lda-settings.c
1.49 cppflags="%{l_cppflags}"
1.50 ldflags="%{l_ldflags} %{l_fsl_ldflags}"
1.51 - libs="%{l_fsl_libs}"
1.52 + libs="%{l_fsl_libs} `%{l_prefix}/bin/pkg-config --libs-only-l openssl`"
1.53 sql_drivers=""
1.54 %if "%{with_ldap}" == "yes"
1.55 - libs="$libs -llber -lssl -lcrypto"
1.56 + ldflags="$ldflags `%{l_prefix}/bin/pkg-config --libs-only-L openldap`"
1.57 + libs="$libs `%{l_prefix}/bin/pkg-config --libs-only-l openldap`"
1.58 %endif
1.59 %if "%{with_mysql}" == "yes"
1.60 cppflags="$cppflags %{l_cppflags mysql}"
1.61 ldflags="$ldflags %{l_ldflags mysql}"
1.62 %endif
1.63 %if "%{with_pgsql}" == "yes"
1.64 - libs="$libs -lssl -lcrypto -lcrypt"
1.65 + libs="$libs `%{l_prefix}/bin/pg_config --libs"
1.66 %endif
1.67 sql_drivers=`echo "$sql_drivers" | sed 's;^,;;'`
1.68 CC="%{l_cc}" \
1.69 @@ -215,9 +212,6 @@
1.70 %endif
1.71
1.72 %install
1.73 - # clean build cruft
1.74 - rm -rf $RPM_BUILD_ROOT
1.75 -
1.76 # install Dovecot
1.77 %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
1.78
1.79 @@ -282,7 +276,6 @@
1.80 %files -f files
1.81
1.82 %clean
1.83 - rm -rf $RPM_BUILD_ROOT
1.84
1.85 %post
1.86 # after upgrade, restart service
