- 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 5fec6d6a0752af8ab8b745a4a5ac7bb4f216c14d..6fe1ae00ba31400eefeaf15f051932da7a6a7d97 100644 (file)
--- a/db.spec
+++ b/db.spec
@@ -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
@@ -212,6 +212,7 @@ export CC CXX CFLAGS CXXFLAGS
 
 ../dist/configure \
        --prefix=%{_prefix} \
+       --libdir=%{_libdir} \
        --enable-compat185 \
        --disable-shared \
        --enable-static \
@@ -227,6 +228,7 @@ cd ../build_unix
 
 ../dist/configure \
        --prefix=%{_prefix} \
+       --libdir=%{_libdir} \
        --enable-compat185 \
        --enable-shared \
        --disable-static \
@@ -246,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=""