- updated to the last BDB 5.2 release (5.2.42)

- added link patch (fixes libdb-sql linking)
- added sql-features patch (adds SQLITE_ENABLE_COLUMN_METADATA needed by libgda)

diff --git a/db5.2-link.patch b/db5.2-link.patch
new file mode 100644 (file)
index 0000000..a205476
--- /dev/null
+++ b/db5.2-link.patch
@@ -0,0 +1,11 @@
+--- db-5.2.42/dist/Makefile.in.orig    2013-06-09 07:40:47.715060826 +0200
++++ db-5.2.42/dist/Makefile.in 2013-06-09 08:06:06.361695837 +0200
+@@ -882,7 +882,7 @@
+ 
+ # Shared SQL library.
+ $(libsqlso_target): $(SQL_OBJS)
+-      $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(SQL_OBJS) $(LIBCSO_LIBS)
++      $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(SQL_OBJS) $(LIBCSO_LIBS) -ldl
+       $(RM) $(libsql)
+       $(LN) -s .libs/$(libsql_version) $(libsql)
+ 

diff --git a/db5.2-sql-features.patch b/db5.2-sql-features.patch
new file mode 100644 (file)
index 0000000..76d746b
--- /dev/null
+++ b/db5.2-sql-features.patch
@@ -0,0 +1,20 @@
+--- db-5.2.42/dist/configure.ac.orig   2012-02-29 19:48:30.000000000 +0100
++++ db-5.2.42/dist/configure.ac        2013-06-09 08:42:31.501650292 +0200
+@@ -582,6 +582,7 @@
+       if test "$db_cv_build_cryptography" = "yes"; then
+               SQL_FLAGS="$SQL_FLAGS -DSQLITE_HAS_CODEC=1"
+       fi
++      SQL_FLAGS="$SQL_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1"
+ fi
+ 
+ if test "$db_cv_sql_compat" = "yes"; then
+--- db-5.2.42/dist/configure.orig      2012-02-29 19:48:30.000000000 +0100
++++ db-5.2.42/dist/configure   2013-06-09 09:44:23.258239592 +0200
+@@ -18737,6 +18737,7 @@
+       if test "$db_cv_build_cryptography" = "yes"; then
+               SQL_FLAGS="$SQL_FLAGS -DSQLITE_HAS_CODEC=1"
+       fi
++      SQL_FLAGS="$SQL_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1"
+ fi
+ 
+ if test "$db_cv_sql_compat" = "yes"; then

diff --git a/db5.2.spec b/db5.2.spec
index 2094f9b25057bdae051cbefcc86fcdca52ee7189..34f8b35661b028cc8e2b2360229850631144bd08 100644 (file)
--- a/db5.2.spec
+++ b/db5.2.spec
@@ -11,18 +11,20 @@
 
 %define                major           5
 %define                libver          %{major}.2
-%define                ver             %{libver}.36
+%define                ver             %{libver}.42
 %define                patchlevel      0
 Summary:       Berkeley DB database library for C
 Summary(pl.UTF-8):     Biblioteka C do obsługi baz Berkeley DB
 Name:          db5.2
 Version:       %{ver}.%{patchlevel}
-Release:       4
+Release:       1
 License:       BSD-like (see LICENSE)
 Group:         Libraries
 #Source0Download: http://www.oracle.com/technetwork/database/berkeleydb/downloads/index-082944.html
 Source0:       http://download.oracle.com/berkeley-db/db-%{ver}.tar.gz
-# Source0-md5: 88466dd6c13d5d8cddb406be8a1d4d92
+# Source0-md5: 28c39545efbeb926d1efef0bf33135b9
+Patch0:                %{name}-link.patch
+Patch1:                %{name}-sql-features.patch
 URL:           http://www.oracle.com/technetwork/database/berkeleydb/downloads/index.html
 BuildRequires: automake
 %if %{with java}
@@ -368,6 +370,8 @@ poleceń.
 
 %prep
 %setup -q -n db-%{ver}
+%patch0 -p1
+%patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.sub dist