This commit was manufactured by cvs2git to create tag 'auto-ac-

db4_5-4_5_20-7'.

Sprout from master 2007-02-28 21:37:21 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- new'
Cherrypick from unlabeled-1.8.2 2008-02-18 21:44:45 UTC Elan Ruusamäe <glen@pld-linux.org> '- and i was wrong':
    db4.5.spec -> 1.8.2.6

diff --git a/db4.5.spec b/db4.5.spec
index 6e5191b458a0a31ade77dca272e1d578e87f2f77..58f72ba36afabed16ff3bcccf572ae90555f7f3b 100644 (file)
--- a/db4.5.spec
+++ b/db4.5.spec
@@ -3,22 +3,27 @@
 %bcond_with    java    # build db-java
 %bcond_without tcl     # don't build Tcl bindings
 %bcond_with    pmutex  # use POSIX mutexes (only process-private with linuxthreads)
-%bcond_without nptl    # don't use process-shared POSIX mutexes (NPTL provides full interface)
+%bcond_with    nptl    # don't use process-shared POSIX mutexes (NPTL provides full interface)
 %bcond_without static_libs     # don't build static libraries
 #
 %{?with_nptl:%define   with_pmutex     1}
+%ifnarch i586 i686 athlon pentium3 pentium4 %{x8664}
+%undefine with_java
+%endif
 %define        mver    4.5
 Summary:       Berkeley DB database library for C
 Summary(pl.UTF-8):     Biblioteka C do obsługi baz Berkeley DB
-Name:          db%{mver}
+Name:          db4.5
 Version:       %{mver}.20
-Release:       3
+Release:       7
 Epoch:         0
 License:       Sleepycat public license (GPL-like, see LICENSE)
 Group:         Libraries
 # alternative site (sometimes working): http://www.berkeleydb.com/
 Source0:       http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 # Source0-md5: b0f1c777708cb8e9d37fb47e7ed3312d
+Patch0:                patch.4.5.20.1
+Patch1:                patch.4.5.20.2
 URL:           http://www.oracle.com/technology/products/berkeley-db/index.html
 BuildRequires: autoconf
 BuildRequires: automake
@@ -30,12 +35,9 @@ BuildRequires:       sed >= 4.0
 %{?with_tcl:BuildRequires:     tcl-devel >= 8.4.0}
 Provides:      db = %{version}-%{release}
 Obsoletes:     db4
+Conflicts:     rpm < 4.4.9-41
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%ifarch i586 i686 athlon pentium3 pentium4 %{x8664}
-%define        with_java       1
-%endif
-
 %description
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
 provides embedded database support for both traditional and
@@ -156,7 +158,7 @@ Statyczna wersja biblioteki db-cxx.
 Summary:       Berkeley database library for Java
 Summary(pl.UTF-8):     Biblioteka baz danych Berkeley dla Javy
 Group:         Libraries
-Requires:      jre
+Requires:      jpackage-utils
 Provides:      db-java = %{version}-%{release}
 
 %description java
@@ -213,9 +215,8 @@ 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:     db4-utils
-# obsolete Ra package
 Obsoletes:     db3-utils
+Obsoletes:     db4-utils
 
 %description utils
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -241,6 +242,8 @@ poleceń.
 
 %prep
 %setup -q -n db-%{version}
+%patch0 -p0
+%patch1 -p0
 
 %if !%{with nptl}
 sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
@@ -263,7 +266,7 @@ CC="%{__cc}"
 CXX="%{__cxx}"
 CFLAGS="%{rpmcflags}"
 CXXFLAGS="%{rpmcflags} -fno-implicit-templates"
-LDFLAGS="%{rpmldflags}"
+LDFLAGS="%{rpmcflags} %{rpmldflags}"
 export CC CXX CFLAGS CXXFLAGS LDFLAGS
 
 ../dist/%configure \