[libetpan] 1.1-5

[Andreas Bierfert]

commit e5447a0927d38e525c77c53a6610be01e6b4041f
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Thu Mar 7 18:03:15 2013 +0100

    1.1-5
    
    - Build against liblockfile to avoid internal locking code
    - Fix build against newer berkley db and add guard to cause build failure an
      even newer versions

 .gitignore                     |    3 ---
 libetpan-configure-newdb.patch |   24 ++++++++++++++++++++++++
 libetpan.spec                  |   22 ++++++++++++++++------
 3 files changed, 40 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5c704b9..33df970 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-libetpan-1.0.tar.gz
-/libetpan-svn409.tar.bz2
-/libetpan-20110312cvs.tar.bz2
 /libetpan-1.1.tar.gz
diff --git a/libetpan-configure-newdb.patch b/libetpan-configure-newdb.patch
new file mode 100644
index 0000000..f71e139
--- /dev/null
+++ b/libetpan-configure-newdb.patch
@@ -0,0 +1,24 @@
+diff -up libetpan-1.1/configure.ac.orig libetpan-1.1/configure.ac
+--- libetpan-1.1/configure.ac.orig	2013-03-07 17:48:50.579530072 +0100
++++ libetpan-1.1/configure.ac	2013-03-07 17:49:36.368320253 +0100
+@@ -385,7 +385,7 @@ dnl Look for db3 or superior with db_cre
+   case "$DBVERS" in
+     3)
+     AC_MSG_RESULT([version 3.x or above])
+-    for lib in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do
++    for lib in db-5.3 db-5.2 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do
+       if test "x$DBLINKED" = "x0"; then
+ dnl        AC_CHECK_LIB($lib, db_create, [DBLIB="-l$lib"; DBLINKED=1], [])
+ dnl installations of libdb4 function names are defined in db.h
+diff -up libetpan-1.1/configure.orig libetpan-1.1/configure
+--- libetpan-1.1/configure.orig	2013-03-07 17:56:28.274406535 +0100
++++ libetpan-1.1/configure	2013-03-07 17:56:55.046548448 +0100
+@@ -18447,7 +18447,7 @@ rm -f core conftest.err conftest.$ac_obj
+     3)
+     { echo "$as_me:$LINENO: result: version 3.x or above" >&5
+ echo "${ECHO_T}version 3.x or above" >&6; }
+-    for lib in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do
++    for lib in db-5.3 db-5.2 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db-3.2 db-3 db3 db; do
+       if test "x$DBLINKED" = "x0"; then
+         { echo "$as_me:$LINENO: checking for db_create() in -l$lib" >&5
+ echo $ECHO_N "checking for db_create() in -l$lib... $ECHO_C" >&6; }
diff --git a/libetpan.spec b/libetpan.spec
index d1e0d65..2d1950d 100644
--- a/libetpan.spec
+++ b/libetpan.spec
@@ -1,16 +1,19 @@
 Name:           libetpan
 Version:        1.1
-Release:        4%{?dist}
-Summary: Portable, efficient middle-ware for different kinds of mail access
+Release:        5%{?dist}
+Summary:        Portable, efficient middle-ware for different kinds of mail access
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.etpan.org/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         libetpan-multiarch.patch
+# fix berkley db detection for newer berkley db...
+Patch1:         libetpan-configure-newdb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  db4-devel
+BuildRequires:  liblockfile-devel
+BuildRequires:  libdb-devel < 5.4
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  libcurl-devel expat-devel
@@ -27,9 +30,10 @@ interface is the same for all kinds of mail access, remote and local mailboxes.
 Summary:        Development package for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       liblockfile-devel
 Requires:       gnutls-devel
 Requires:       cyrus-sasl-devel
-Requires:       db4-devel
+Requires:       libdb-devel < 5.4
 Requires:       expat-devel libcurl-devel
 Requires:       zlib-devel
 
@@ -39,7 +43,8 @@ with %{name}.
 
 %prep
 %setup -q
-%patch0 -b.multi
+%patch0 -b .multi
+%patch1 -p1 -b .newdb
 
 %build
 %configure --disable-static --with-gnutls=yes --with-openssl=no
@@ -48,7 +53,6 @@ make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
 cd doc
 make doc
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -78,6 +82,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Thu Mar 07 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1-5
+- Build against liblockfile to avoid internal locking code
+- Fix build against newer berkley db and add guard to cause build failure an
+  even newer versions
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild