- commit correct file...

[packages/db5.3.git] / db5.3.spec

diff --git a/db5.3.spec b/db5.3.spec
index ac1a0084bda86071ea74909f9caa803820439fbd..5452460cc0fa92964443e1656944a83444b577bf 100644 (file)
--- a/db5.3.spec
+++ b/db5.3.spec
@@ -5,9 +5,7 @@
 %bcond_without static_libs     # don't build static libraries
 %bcond_with    sqlite3         # build Sqlite3 API libraries
 %bcond_without default_db      # don't use this db as default system db [Th uses DB 5.3]
-%bcond_with    rpm_db          # install library to rootfs for /bin/rpm
-
-%{load:/usr/lib/rpm/macros.d/java}
+%bcond_without rpm_db          # install library to rootfs for /bin/rpm
 
 %define                major           5
 %define                libver          %{major}.3
@@ -17,7 +15,7 @@ Summary:      Berkeley DB database library for C
 Summary(pl.UTF-8):     Biblioteka C do obsługi baz Berkeley DB
 Name:          db5.3
 Version:       %{ver}.%{patchlevel}
-Release:       4
+Release:       8
 License:       BSD-like (see LICENSE)
 Group:         Libraries
 #Source0Download: http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html
@@ -26,6 +24,8 @@ Source0:      http://download.oracle.com/berkeley-db/db-%{ver}.tar.gz
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-sql-features.patch
 Patch2:                db-5.3.28-cwd-db_config.patch
+Patch3:                %{name}-atomic_compare_exchange.patch
+Patch4:                java.patch
 URL:           http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html
 BuildRequires: automake
 %if %{with java}
@@ -374,11 +374,14 @@ poleceń.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 cp -f /usr/share/automake/config.sub dist
+cp -f /usr/share/automake/config.sub lang/sql/sqlite
 
-JAVACFLAGS="-source 1.5 -target 1.5"
+JAVACFLAGS="-source 1.6 -target 1.6"
 export JAVACFLAGS
 
 %if %{with static_libs}