OpenPKG Specs / changeset

     1.1 --- a/dovecot/dovecot.patch	Wed Feb 08 20:16:25 2012 +0200
     1.2 +++ b/dovecot/dovecot.patch	Tue Aug 28 18:52:55 2012 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: configure.in
     1.5 ---- configure.in.orig	2011-03-04 19:47:50.000000000 +0100
     1.6 -+++ configure.in	2011-03-05 13:00:48.000000000 +0100
     1.7 -@@ -2100,14 +2100,14 @@
     1.8 +--- configure.in.orig	2012-04-23 14:35:10.000000000 +0200
     1.9 ++++ configure.in	2012-04-29 19:55:10.000000000 +0200
    1.10 +@@ -2122,14 +2122,14 @@
    1.11     AC_CHECK_PROG(PG_CONFIG, pg_config, pg_config, NO)
    1.12     if test $PG_CONFIG = NO; then
    1.13       # based on code from PHP
    1.14 @@ -21,9 +21,9 @@
    1.15   	    PGSQL_LIBDIR=$i/$j
    1.16   	  fi
    1.17  Index: configure
    1.18 ---- configure.orig	2011-03-04 19:47:55.000000000 +0100
    1.19 -+++ configure	2011-03-05 13:00:48.000000000 +0100
    1.20 -@@ -22858,14 +22858,14 @@
    1.21 +--- configure.orig	2012-04-23 14:35:52.000000000 +0200
    1.22 ++++ configure	2012-04-29 19:55:11.000000000 +0200
    1.23 +@@ -22919,14 +22919,14 @@
    1.24   
    1.25     if test $PG_CONFIG = NO; then
    1.26       # based on code from PHP

     2.1 --- a/dovecot/dovecot.spec	Wed Feb 08 20:16:25 2012 +0200
     2.2 +++ b/dovecot/dovecot.spec	Tue Aug 28 18:52:55 2012 +0200
     2.3 @@ -22,9 +22,9 @@
     2.4  ##
     2.5  
     2.6  #   package version
     2.7 -%define       V_major       2.0
     2.8 -%define       V_minor       18
     2.9 -%define       V_pigeonhole  0.2.6
    2.10 +%define       V_major       2.1
    2.11 +%define       V_minor       9
    2.12 +%define       V_pigeonhole  0.3.1
    2.13  
    2.14  #   package information
    2.15  Name:         dovecot
    2.16 @@ -37,7 +37,7 @@
    2.17  Group:        Mail
    2.18  License:      MIT+LGPL
    2.19  Version:      %{V_major}.%{V_minor}
    2.20 -Release:      20120208
    2.21 +Release:      20120800
    2.22  
    2.23  #   package options
    2.24  %option       with_fsl          yes
    2.25 @@ -57,10 +57,8 @@
    2.26  Patch0:       dovecot.patch
    2.27  
    2.28  #   build information
    2.29 -Prefix:       %{l_prefix}
    2.30 -BuildRoot:    %{l_buildroot}
    2.31 -BuildPreReq:  OpenPKG, openpkg >= 20060823
    2.32 -PreReq:       OpenPKG, openpkg >= 20060823, MTA, x509
    2.33 +BuildPreReq:  OpenPKG, openpkg >= 20100101, pkgconfig
    2.34 +PreReq:       OpenPKG, openpkg >= 20100101, MTA, x509
    2.35  BuildPreReq:  libiconv, openssl, zlib, bzip2
    2.36  PreReq:       libiconv, openssl, zlib, bzip2
    2.37  %if "%{with_fsl}" == "yes"
    2.38 @@ -91,8 +89,6 @@
    2.39  BuildPreReq:  sqlite
    2.40  PreReq:       sqlite
    2.41  %endif
    2.42 -AutoReq:      no
    2.43 -AutoReqProv:  no
    2.44  
    2.45  %description
    2.46      Dovecot is an Open Source IMAP and POP3 server, written with
    2.47 @@ -127,17 +123,18 @@
    2.48          src/lib-lda/lda-settings.c
    2.49      cppflags="%{l_cppflags}"
    2.50      ldflags="%{l_ldflags} %{l_fsl_ldflags}"
    2.51 -    libs="%{l_fsl_libs}"
    2.52 +    libs="%{l_fsl_libs} `%{l_prefix}/bin/pkg-config --libs-only-l openssl`"
    2.53      sql_drivers=""
    2.54  %if "%{with_ldap}" == "yes"
    2.55 -    libs="$libs -llber -lssl -lcrypto"
    2.56 +    ldflags="$ldflags `%{l_prefix}/bin/pkg-config --libs-only-L openldap`"
    2.57 +    libs="$libs `%{l_prefix}/bin/pkg-config --libs-only-l openldap`"
    2.58  %endif
    2.59  %if "%{with_mysql}" == "yes"
    2.60      cppflags="$cppflags %{l_cppflags mysql}"
    2.61      ldflags="$ldflags %{l_ldflags mysql}"
    2.62  %endif
    2.63  %if "%{with_pgsql}" == "yes"
    2.64 -    libs="$libs -lssl -lcrypto -lcrypt"
    2.65 +    libs="$libs `%{l_prefix}/bin/pg_config --libs"
    2.66  %endif
    2.67      sql_drivers=`echo "$sql_drivers" | sed 's;^,;;'`
    2.68      CC="%{l_cc}" \
    2.69 @@ -215,9 +212,6 @@
    2.70  %endif
    2.71  
    2.72  %install
    2.73 -    #   clean build cruft
    2.74 -    rm -rf $RPM_BUILD_ROOT
    2.75 -
    2.76      #   install Dovecot
    2.77      %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
    2.78  
    2.79 @@ -282,7 +276,6 @@
    2.80  %files -f files
    2.81  
    2.82  %clean
    2.83 -    rm -rf $RPM_BUILD_ROOT
    2.84  
    2.85  %post
    2.86      #   after upgrade, restart service