SPECS (AC-branch): db4.5.spec - merge from HEAD (patch.4.5.20.1, p...

[glen]

Author: glen                         Date: Mon Feb 11 20:57:07 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge from HEAD (patch.4.5.20.1, patch.4.5.20.2 patches, jpackage-utils for javadir); rel 4

---- Files affected:
SPECS:
   db4.5.spec (1.8.2.2 -> 1.8.2.3) 

---- Diffs:

================================================================
Index: SPECS/db4.5.spec
diff -u SPECS/db4.5.spec:1.8.2.2 SPECS/db4.5.spec:1.8.2.3
--- SPECS/db4.5.spec:1.8.2.2	Mon Feb 11 21:46:06 2008
+++ SPECS/db4.5.spec	Mon Feb 11 21:57:02 2008
@@ -8,18 +8,23 @@
 %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:	4
 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
@@ -33,10 +38,6 @@
 Obsoletes:	db4
 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
@@ -157,7 +158,7 @@
 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
@@ -242,6 +243,8 @@
 
 %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
@@ -264,7 +267,7 @@
 CXX="%{__cxx}"
 CFLAGS="%{rpmcflags}"
 CXXFLAGS="%{rpmcflags} -fno-implicit-templates"
-LDFLAGS="%{rpmldflags}"
+LDFLAGS="%{rpmcflags} %{rpmldflags}"
 export CC CXX CFLAGS CXXFLAGS LDFLAGS
 
 ../dist/%configure \
@@ -494,6 +497,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8.2.3  2008-02-11 20:57:02  glen
+- merge from HEAD (patch.4.5.20.1, patch.4.5.20.2 patches, jpackage-utils for javadir); rel 4
+
 Revision 1.8.2.2  2008-02-11 20:46:06  glen
 - convert to utf8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/db4.5.spec?r1=1.8.2.2&r2=1.8.2.3&f=u