- rel 11 (fix fastmutexes on amd64; add official fixes nr 3 and 4)

[packages/db.git] / db.spec

diff --git a/db.spec b/db.spec
index 1c61b791656c9e0594378b4e8f8db2df87fae864..1edc1cee1362f495a87f07846445a2951a58aace 100644 (file)
--- a/db.spec
+++ b/db.spec
@@ -3,14 +3,14 @@
 %bcond_with    java    # build db-java (required for openoffice)
 %bcond_without tcl     # don't build Tcl bindings
 %bcond_with    pmutex  # use POSIX mutexes (only process-private with linuxthreads)
-%bcond_with    nptl    # synonym for pmutex (NPTL provides full interface)
+%bcond_with    nptl    # use process-shared POSIX mutexes (NPTL provides full interface)
 #
 %{?with_nptl:%define   with_pmutex     1}
 Summary:       Berkeley DB database library for C
 Summary(pl):   Biblioteka C do obs³ugi baz Berkeley DB
 Name:          db
 Version:       4.2.52
-Release:       8
+Release:       11
 License:       Sleepycat public license (GPL-like, see LICENSE)
 Group:         Libraries
 # alternative site (sometimes working): http://www.berkeleydb.com/
@@ -20,6 +20,9 @@ Source0:      http://www.sleepycat.com/update/snapshot/%{name}-%{version}.tar.gz
 Patch0:                %{name}-so-suffix.patch
 Patch1:                patch.4.2.52.1
 Patch2:                patch.4.2.52.2
+Patch3:                patch.4.2.52.3
+Patch4:                patch.4.2.52.4
+Patch5:                %{name}-amd64-fastmutex.patch
 URL:           http://www.sleepycat.com/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -230,6 +233,13 @@ polece
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
+%patch4 -p0
+%patch5 -p1
+
+%if %{without nptl}
+sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
+%endif
 
 %build
 cd dist
@@ -267,7 +277,7 @@ cd ../build_unix
 
 ../dist/%configure \
        --prefix=%{_prefix} \
-       --libdir=/%{_lib} \
+       --libdir=%{_libdir} \
        --enable-compat185 \
        --enable-rpc \
        --%{?with_pmutex:en}%{!?with_pmutex:dis}able-posixmutexes \
@@ -285,7 +295,7 @@ cd ../build_unix
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir},%{_prefix}/%{_lib}}
+install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir},/%{_lib}}
 %if %{with java}
 install -d $RPM_BUILD_ROOT%{_javadir}
 %endif
@@ -299,10 +309,9 @@ install -d $RPM_BUILD_ROOT%{_javadir}
        DESTDIR=$RPM_BUILD_ROOT \
        LIB_INSTALL_FILE_LIST=""
 
-mv $RPM_BUILD_ROOT/%{_lib}/*.{l,}a $RPM_BUILD_ROOT%{_libdir}/
-mv $RPM_BUILD_ROOT/%{_lib}/libdb_* $RPM_BUILD_ROOT%{_libdir}/
+mv $RPM_BUILD_ROOT%{_libdir}/libdb-4.2.so $RPM_BUILD_ROOT/%{_lib}
 
-cd $RPM_BUILD_ROOT/%{_libdir}
+cd $RPM_BUILD_ROOT%{_libdir}
 ln -sf /%{_lib}/libdb-4.2.so libdb.so
 ln -sf /%{_lib}/libdb-4.2.so libdb4.so
 ln -sf /%{_lib}/libdb-4.2.so libdb-4.so
@@ -313,12 +322,10 @@ ln -sf libdb-4.2.la libndbm.la
 %if %{with java}
 ln -sf libdb_java-4.2.la libdb_java.la
 mv -f $RPM_BUILD_ROOT%{_libdir}/*.jar $RPM_BUILD_ROOT%{_javadir}
-sed -i "s|libdir='/%{_lib}'|libdir='%{_libdir}'|" libdb_java-4.2.la
 %endif
 %if %{with tcl}
 ln -sf libdb_tcl-4.2.so libdb_tcl.so
 ln -sf libdb_tcl-4.2.la libdb_tcl.la
-sed -i "s|libdir='/%{_lib}'|libdir='%{_libdir}'|" libdb_tcl-4.2.la
 %endif
 ln -sf libdb_cxx-4.2.la libdb_cxx.la
 mv -f libdb.a libdb-4.2.a
@@ -333,9 +340,6 @@ ln -sf libdb_cxx-4.2.so libdb_cxx-4.so
 sed -i "s/old_library=''/old_library='libdb-4.2.a'/" libdb-4.2.la
 sed -i "s/old_library=''/old_library='libdb_cxx-4.2.a'/" libdb_cxx-4.2.la
 
-sed -i "s|libdir='/%{_lib}'|libdir='%{_libdir}'|" libdb-4.2.la
-sed -i "s|libdir='/%{_lib}'|libdir='%{_libdir}'|" libdb_cxx-4.2.la
-
 cd -
 rm -f examples_c*/tags
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}