# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1346172775 -7200
# Node ID 747afbba9aa864100752373e79007f07c151549a
# Parent  09548e292fb1f29969466d5718bcd5f24879e1e8
Update versions, adjust patch, modernize packaging, and correct build conf.

diff -r 09548e292fb1 -r 747afbba9aa8 dovecot/dovecot.patch
--- a/dovecot/dovecot.patch	Wed Feb 08 20:16:25 2012 +0200
+++ b/dovecot/dovecot.patch	Tue Aug 28 18:52:55 2012 +0200
@@ -1,7 +1,7 @@
 Index: configure.in
---- configure.in.orig	2011-03-04 19:47:50.000000000 +0100
-+++ configure.in	2011-03-05 13:00:48.000000000 +0100
-@@ -2100,14 +2100,14 @@
+--- configure.in.orig	2012-04-23 14:35:10.000000000 +0200
++++ configure.in	2012-04-29 19:55:10.000000000 +0200
+@@ -2122,14 +2122,14 @@
    AC_CHECK_PROG(PG_CONFIG, pg_config, pg_config, NO)
    if test $PG_CONFIG = NO; then
      # based on code from PHP
@@ -21,9 +21,9 @@
  	    PGSQL_LIBDIR=$i/$j
  	  fi
 Index: configure
---- configure.orig	2011-03-04 19:47:55.000000000 +0100
-+++ configure	2011-03-05 13:00:48.000000000 +0100
-@@ -22858,14 +22858,14 @@
+--- configure.orig	2012-04-23 14:35:52.000000000 +0200
++++ configure	2012-04-29 19:55:11.000000000 +0200
+@@ -22919,14 +22919,14 @@
  
    if test $PG_CONFIG = NO; then
      # based on code from PHP
diff -r 09548e292fb1 -r 747afbba9aa8 dovecot/dovecot.spec
--- a/dovecot/dovecot.spec	Wed Feb 08 20:16:25 2012 +0200
+++ b/dovecot/dovecot.spec	Tue Aug 28 18:52:55 2012 +0200
@@ -22,9 +22,9 @@
 ##
 
 #   package version
-%define       V_major       2.0
-%define       V_minor       18
-%define       V_pigeonhole  0.2.6
+%define       V_major       2.1
+%define       V_minor       9
+%define       V_pigeonhole  0.3.1
 
 #   package information
 Name:         dovecot
@@ -37,7 +37,7 @@
 Group:        Mail
 License:      MIT+LGPL
 Version:      %{V_major}.%{V_minor}
-Release:      20120208
+Release:      20120800
 
 #   package options
 %option       with_fsl          yes
@@ -57,10 +57,8 @@
 Patch0:       dovecot.patch
 
 #   build information
-Prefix:       %{l_prefix}
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060823
-PreReq:       OpenPKG, openpkg >= 20060823, MTA, x509
+BuildPreReq:  OpenPKG, openpkg >= 20100101, pkgconfig
+PreReq:       OpenPKG, openpkg >= 20100101, MTA, x509
 BuildPreReq:  libiconv, openssl, zlib, bzip2
 PreReq:       libiconv, openssl, zlib, bzip2
 %if "%{with_fsl}" == "yes"
@@ -91,8 +89,6 @@
 BuildPreReq:  sqlite
 PreReq:       sqlite
 %endif
-AutoReq:      no
-AutoReqProv:  no
 
 %description
     Dovecot is an Open Source IMAP and POP3 server, written with
@@ -127,17 +123,18 @@
         src/lib-lda/lda-settings.c
     cppflags="%{l_cppflags}"
     ldflags="%{l_ldflags} %{l_fsl_ldflags}"
-    libs="%{l_fsl_libs}"
+    libs="%{l_fsl_libs} `%{l_prefix}/bin/pkg-config --libs-only-l openssl`"
     sql_drivers=""
 %if "%{with_ldap}" == "yes"
-    libs="$libs -llber -lssl -lcrypto"
+    ldflags="$ldflags `%{l_prefix}/bin/pkg-config --libs-only-L openldap`"
+    libs="$libs `%{l_prefix}/bin/pkg-config --libs-only-l openldap`"
 %endif
 %if "%{with_mysql}" == "yes"
     cppflags="$cppflags %{l_cppflags mysql}"
     ldflags="$ldflags %{l_ldflags mysql}"
 %endif
 %if "%{with_pgsql}" == "yes"
-    libs="$libs -lssl -lcrypto -lcrypt"
+    libs="$libs `%{l_prefix}/bin/pg_config --libs"
 %endif
     sql_drivers=`echo "$sql_drivers" | sed 's;^,;;'`
     CC="%{l_cc}" \
@@ -215,9 +212,6 @@
 %endif
 
 %install
-    #   clean build cruft
-    rm -rf $RPM_BUILD_ROOT
-
     #   install Dovecot
     %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
 
@@ -282,7 +276,6 @@
 %files -f files
 
 %clean
-    rm -rf $RPM_BUILD_ROOT
 
 %post
     #   after upgrade, restart service