- force passing libdir to configure/make install for x86_64 compatibility

[packages/db.git] / db.spec

diff --git a/db.spec b/db.spec
index fba039054e79ff36c50333f8db1d5b40bd3fd9dc..6fe1ae00ba31400eefeaf15f051932da7a6a7d97 100644 (file)
--- a/db.spec
+++ b/db.spec
@@ -7,7 +7,7 @@ Summary(pl):    Biblioteka C do obs
 Name:          db
 Version:       4.1.25
 Release:       4
-License:       GPL
+License:       BSD
 Group:         Libraries
 # alternative site (sometimes working): http://www.berkeleydb.com/
 Source0:       http://www.sleepycat.com/update/snapshot/%{name}-%{version}.tar.gz
@@ -17,7 +17,7 @@ Patch1:               http://www.sleepycat.com/update/4.1.25/patch.4.1.25.1
 URL:           http://www.sleepycat.com/
 BuildRequires: autoconf
 BuildRequires: ed
-%{?_with_java:BuildRequires:   jdk}
+%{?_with_java:BuildRequires:   gcc-java}
 BuildRequires: libstdc++-devel
 BuildRequires: tcl-devel >= 8.3.2
 Obsoletes:     db4
@@ -40,8 +40,8 @@ Summary:      Header files for Berkeley database library
 Summary(pl):   Pliki nag³ówkowe do biblioteki Berkeley Database
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
-Obsoletes:     db4-devel
 Obsoletes:     db3-devel
+Obsoletes:     db4-devel
 
 %description devel
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -70,8 +70,8 @@ Summary:      Static libraries for Berkeley database library
 Summary(pl):   Statyczne biblioteki Berkeley Database
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}
-Obsoletes:     db4-static
 Obsoletes:     db3-static
+Obsoletes:     db4-static
 
 %description static
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -112,8 +112,9 @@ Summary:    Berkeley database library for C++
 Summary(pl):   Biblioteka baz danych Berkeley dla C++
 Group:         Libraries
 Requires:      %{name}-cxx = %{version}
-Obsoletes:     %{name}-devel < 4.1.25-3
+Requires:      %{name}-devel = %{version}
 Obsoletes:     db4-cxx
+Conflicts:     db-devel < 4.1.25-3
 
 %description cxx-devel
 Berkeley database library for C++.
@@ -151,8 +152,8 @@ Summary(pl):        Biblioteka baz danych Berkeley dla TCL
 Group:         Development/Languages/Tcl
 Requires:      tcl
 Requires:      %{name}-tcl = %{version}
-Obsoletes:     %{name}-devel < 4.1.25-3
 Obsoletes:     db4-tcl
+Conflicts:     db-devel < 4.1.25-3
 
 %description tcl-devel
 Berkeley database library for TCL.
@@ -211,6 +212,7 @@ export CC CXX CFLAGS CXXFLAGS
 
 ../dist/configure \
        --prefix=%{_prefix} \
+       --libdir=%{_libdir} \
        --enable-compat185 \
        --disable-shared \
        --enable-static \
@@ -226,6 +228,7 @@ cd ../build_unix
 
 ../dist/configure \
        --prefix=%{_prefix} \
+       --libdir=%{_libdir} \
        --enable-compat185 \
        --enable-shared \
        --disable-static \
@@ -235,7 +238,8 @@ cd ../build_unix
        --with-tcl=/usr/lib \
        %{?_with_java:--enable-java}
 
-%{__make} library_build TCFLAGS='-I$(builddir) -I%{_includedir}'
+%{__make} library_build \
+       TCFLAGS='-I$(builddir) -I%{_includedir}'
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -244,12 +248,14 @@ install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir},/lib}
 cd build_unix.static
 
 %{__make} library_install \
-       prefix=$RPM_BUILD_ROOT%{_prefix}
+       prefix=$RPM_BUILD_ROOT%{_prefix} \
+       libdir=$RPM_BUILD_ROOT%{_libdir} 
 
 cd ../build_unix
 
 %{__make} library_install \
        prefix=$RPM_BUILD_ROOT%{_prefix} \
+       libdir=$RPM_BUILD_ROOT%{_libdir} \
        includedir=$RPM_BUILD_ROOT%{_includedir} \
        LIB_INSTALL_FILE_LIST=""