- restored libdb patch, force compilation with db4.7

diff --git a/poldek-libdb.patch b/poldek-libdb.patch
index e739f504c9c94967da9a7dd9c19ae9e2e5129267..2533baf6a3620c8f87b73f19e419224bfbd81f99 100644 (file)
--- a/poldek-libdb.patch
+++ b/poldek-libdb.patch
@@ -26,7 +26,7 @@ diff -ur poldek-0.30.1.orig/configure.ac poldek-0.30.1/configure.ac
 -             [AC_CHECK_LIB(db-4.0, db_create, [DBLIB="-ldb-4.0" DBINCLUDE="-I/usr/include/db4.0"],
 -                     [AC_CHECK_LIB(db-5.2, db_create, [DBLIB="-ldb-5.2" DBINCLUDE="-I/usr/include/db5.2"],,[$LIBS])],
 -                     [$LIBS])],, [$LIBS])],, [$LIBS])
 -             [AC_CHECK_LIB(db-4.0, db_create, [DBLIB="-ldb-4.0" DBINCLUDE="-I/usr/include/db4.0"],
 -                     [AC_CHECK_LIB(db-5.2, db_create, [DBLIB="-ldb-5.2" DBINCLUDE="-I/usr/include/db5.2"],,[$LIBS])],
 -                     [$LIBS])],, [$LIBS])],, [$LIBS])

-+AC_CHECK_LIB(db-4.5, db_create, [DBLIB="-ldb-4.5" DBINCLUDE="-I/usr/include/db4.5"],,[$LIBS])
++AC_CHECK_LIB(db-4.7, db_create, [DBLIB="-ldb-4.7" DBINCLUDE="-I/usr/include/db4.7"],,[$LIBS])

  
 -      if test "${ENABLE_STATIC}." = "yes."; then 
 -              DBLIB="$DBLIB"
  
 -      if test "${ENABLE_STATIC}." = "yes."; then 
 -              DBLIB="$DBLIB"

diff --git a/poldek.spec b/poldek.spec
index 22af5d2c53a17faf0211675e958aec121ac176ae..c9b65dfa4f5fd818e67a296a51df430c12fbcf03 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -36,6 +36,7 @@ Patch1:               %{name}-config.patch
 Patch2:                pm-hooks.patch
 Patch3:                WTERMSIG.patch
 Patch4:                %{name}-no_local_stdint.patch
 Patch2:                pm-hooks.patch
 Patch3:                WTERMSIG.patch
 Patch4:                %{name}-no_local_stdint.patch

+Patch5:                %{name}-libdb.patch

 URL:           http://poldek.pld-linux.org/
 BuildRequires: %{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires: autoconf
 URL:           http://poldek.pld-linux.org/
 BuildRequires: %{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires: autoconf


@@ -201,6 +202,7 @@ Moduły języka Python dla poldka.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1

+%patch5 -p1

 
 %{__rm} m4/libtool.m4 m4/lt*.m4
 
 
 %{__rm} m4/libtool.m4 m4/lt*.m4