- Don't force specific jdk.

[packages/db4.8.git] / db4.8.spec

diff --git a/db4.8.spec b/db4.8.spec
index d57ef6cef04b84a5845c11ab30769b544412c614..d857fac790a9bf7b536f6e3c1dade6cd46fc3c57 100644 (file)
--- a/db4.8.spec
+++ b/db4.8.spec
@@ -4,17 +4,11 @@
 %bcond_without tcl             # don't build Tcl bindings
 %bcond_without static_libs     # don't build static libraries
 
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun        # build with gcj
-%else
-%bcond_with    java_sun        # build with java-sun
-%endif
-
 %include       /usr/lib/rpm/macros.java
 
 %define                libver          4.8
-%define                ver                     %{libver}.24
-%define                patchlevel      1
+%define                ver                     %{libver}.26
+%define                patchlevel      0
 Summary:       Berkeley DB database library for C
 Summary(pl.UTF-8):     Biblioteka C do obsługi baz Berkeley DB
 Name:          db4.8
@@ -24,15 +18,12 @@ Epoch:              0
 License:       GPL-like (see LICENSE)
 Group:         Libraries
 Source0:       http://download.oracle.com/berkeley-db/db-%{ver}.tar.gz
-# Source0-md5: 147afdecf438ff99ade105a5272db158
+# Source0-md5: 3476bac9ec0f3c40729c8a404151d5e3
 # %%patchset_source -f http://www.oracle.com/technology/products/berkeley-db/db/update/%{ver}/patch.%{ver}.%g 1 %{patchlevel}
 URL:           http://www.oracle.com/technology/products/berkeley-db/index.html
 BuildRequires: automake
-BuildRequires: ed
 %if %{with java}
-%{!?with_java_sun:BuildRequires:       java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:        java-sun}
-BuildRequires: rpm >= 4.4.9-56
+BuildRequires: jdk
 BuildRequires: rpm-javaprov
 %endif
 BuildRequires: libstdc++-devel
@@ -40,8 +31,8 @@ BuildRequires:        rpmbuild(macros) >= 1.426
 BuildRequires: sed >= 4.0
 %{?with_tcl:BuildRequires:     tcl-devel >= 8.4.0}
 Requires:      uname(release) >= 2.6.0
-Provides:      db = %{version}-%{release}
 Provides:      db = %{libver}
+Provides:      db = %{version}-%{release}
 Obsoletes:     db4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -63,10 +54,9 @@ Summary(pl.UTF-8):   Pliki nagłówkowe do biblioteki Berkeley Database
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Provides:      db-devel = %{version}-%{release}
+Obsoletes:     db-devel
 Obsoletes:     db3-devel
 Obsoletes:     db4-devel
-Obsoletes:     db4.5-devel
-Obsoletes:     db4.6-devel
 
 %description devel
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -96,10 +86,9 @@ Summary(pl.UTF-8):   Statyczne biblioteki Berkeley Database
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Provides:      db-static = %{version}-%{release}
+Obsoletes:     db-static
 Obsoletes:     db3-static
 Obsoletes:     db4-static
-Obsoletes:     db4.5-static
-Obsoletes:     db4.6-static
 
 %description static
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -143,6 +132,7 @@ Group:              Development/Libraries
 Requires:      %{name}-cxx = %{epoch}:%{version}-%{release}
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Provides:      db-cxx-devel = %{version}-%{release}
+Obsoletes:     db-cxx-devel
 Conflicts:     db-devel < 4.1.25-3
 
 %description cxx-devel
@@ -157,6 +147,7 @@ Summary(pl.UTF-8):  Statyczna wersja biblioteki db-cxx
 Group:         Development/Libraries
 Requires:      %{name}-cxx-devel = %{epoch}:%{version}-%{release}
 Provides:      db-cxx-static = %{version}-%{release}
+Obsoletes:     db-cxx-static
 Conflicts:     db-static < 4.2.50-1
 
 %description cxx-static
@@ -171,6 +162,8 @@ Summary(pl.UTF-8):  Biblioteka baz danych Berkeley dla Javy
 Group:         Libraries
 Requires:      jpackage-utils
 Provides:      db-java = %{version}-%{release}
+# db.jar conflicts
+Obsoletes:     db-java
 
 %description java
 Berkeley database library for Java.
@@ -184,6 +177,7 @@ Summary(pl.UTF-8):  Pliki programistyczne biblioteki db-java
 Group:         Development/Languages/Java
 Requires:      %{name}-java = %{epoch}:%{version}-%{release}
 Provides:      db-java-devel = %{version}-%{release}
+Obsoletes:     db-java-devel
 Conflicts:     db-devel < 4.1.25-3
 
 %description java-devel
@@ -212,6 +206,7 @@ Summary(pl.UTF-8):  Pliki programistyczne biblioteki db-tcl
 Group:         Development/Languages/Tcl
 Requires:      %{name}-tcl = %{epoch}:%{version}-%{release}
 Provides:      db-tcl-devel = %{version}-%{release}
+Obsoletes:     db-tcl-devel
 Conflicts:     db-devel < 4.1.25-3
 
 %description tcl-devel
@@ -226,6 +221,7 @@ Summary(pl.UTF-8):  Narzędzia do obsługi baz Berkeley DB z linii poleceń
 Group:         Applications/Databases
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Provides:      db-utils = %{version}-%{release}
+Obsoletes:     db-utils
 Obsoletes:     db3-utils
 Obsoletes:     db4-utils