packages: db4.6/db4.6.spec - up to 4.6.21.4

Mon Feb 22 17:58:49 CET 2010

Author: glen                         Date: Mon Feb 22 16:58:49 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 4.6.21.4

---- Files affected:
packages/db4.6:
   db4.6.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/db4.6/db4.6.spec
diff -u packages/db4.6/db4.6.spec:1.7 packages/db4.6/db4.6.spec:1.8

--- packages/db4.6/db4.6.spec:1.7	Tue May 20 09:00:46 2008
+++ packages/db4.6/db4.6.spec	Mon Feb 22 17:58:43 2010
@@ -6,24 +6,28 @@
 %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_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.6
+
+%define		mver		4.6
+%define		ver			%{mver}.21
+%define		patchlevel	4
 Summary:	Berkeley DB database library for C
 Summary(pl.UTF-8):	Biblioteka C do obsługi baz Berkeley DB
 Name:		db4.6
-Version:	%{mver}.21
-Release:	2
+Version:	%{ver}.%{patchlevel}
+Release:	1
 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:	http://download.oracle.com/berkeley-db/db-%{ver}.tar.gz
 # Source0-md5:	718082e7e35fc48478a2334b0bc4cd11
-Patch0:		http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.1
+%patchset_source -f http://www.oracle.com/technology/products/berkeley-db/db/update/%{ver}/patch.%{ver}.%g 1 %{patchlevel}
 URL:		http://www.oracle.com/technology/products/berkeley-db/index.html
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -31,10 +35,11 @@
 %{?with_java:BuildRequires:	jdk}
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
+BuildRequires:	rpmbuild(macros) >= 1.426
 BuildRequires:	sed >= 4.0
 %{?with_tcl:BuildRequires:	tcl-devel >= 8.4.0}
-Provides:	db = %{version}-%{release}
 %{?with_rpm_robustness:Requires:	uname(release) >= 2.6.17}
+Provides:	db = %{version}-%{release}
 Obsoletes:	db4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -216,9 +221,9 @@
 Group:		Applications/Databases
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	db-utils = %{version}-%{release}
+Obsoletes:	db3-utils
 Obsoletes:	db4-utils
 # obsolete Ra package
-Obsoletes:	db3-utils
 
 %description utils
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -243,10 +248,12 @@
 poleceń.
 
 %prep
-%setup -q -n db-%{version}
-%patch0 -p0
+%setup -q -n db-%{ver}
+
+# official patches
+%patchset_patch 1 %{patchlevel}
 
-%if !%{with nptl}
+%if %{without nptl}
 sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
 %endif
 
@@ -500,6 +507,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2010/02/22 16:58:43  glen
+- up to 4.6.21.4
+
 Revision 1.7  2008/05/20 07:00:46  arekm
 - rel 2; Fixes a race condition between checkpoint and DB->close which can result in the checkpoint thread self-deadlocking.
 
@@ -520,69 +530,3 @@
 
 Revision 1.1  2007/07/24 16:42:48  arekm
 - initial from 4.6 series (4.6.18)
-
-Revision 1.17  2007/06/28 19:10:27  arekm
-- rel 7
-
-Revision 1.16  2007/06/28 19:07:09  arekm
-- rel 6; bcond it, too problematic
-
-Revision 1.15  2007/06/28 19:00:28  arekm
-- require kernel newer than 2.6.16
-
-Revision 1.14  2007/06/28 17:16:47  arekm
-- rel 5; robustness patch from rpm
-
-Revision 1.13  2007/06/14 18:18:29  arekm
-- rel 4
-
-Revision 1.12  2007/06/02 17:17:17  qboosh
-- fixed java bcond on !x86
-
-Revision 1.11  2007/06/02 16:32:50  areq
-- fix without java
-
-Revision 1.10  2007/03/05 09:57:53  tommat
-- enable multilib build
-
-Revision 1.9  2007/02/28 21:42:40  arekm
-- rel 3
-
-Revision 1.8  2007/02/12 22:09:09  glen
-- tabs in preamble
-
-Revision 1.7  2007/02/12 01:06:44  baggins
-- converted to UTF-8
-
-Revision 1.6  2006/11/26 01:09:27  arekm
-- rel 3
-
-Revision 1.5  2006/11/13 14:54:48  sparky
-- don't use %{without ...}, it may not work after inverting bcond
-
-Revision 1.4  2006/10/30 19:06:15  pluto
-- release 2.
-
-Revision 1.3  2006/09/29 19:15:20  arekm
-- rel 1.1
-
-Revision 1.2  2006/09/29 16:40:04  arekm
-- java bcond changed
-
-Revision 1.1  2006/09/29 16:20:35  arekm
-- new, 4.5.20
-
-Revision 1.5  2006/04/19 17:41:20  witekfl
-- IMHO better handling of without_static_libs
-
-Revision 1.4  2006/02/20 21:02:27  qboosh
-- updated to 4.4.20 + 2 official patches
-
-Revision 1.3  2005/12/13 18:01:46  glen
-- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
-
-Revision 1.2  2005/12/02 08:31:25  qboosh
-- -utils Obsoletes: db3-utils (no db3 after Ra)
-
-Revision 1.1  2005/11/18 20:28:34  qboosh
-- new (packaged as default db)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/db4.6/db4.6.spec?r1=1.7&r2=1.8&f=u

