SPECS: db4.2.spec - merge update to 4.2.52.5 from db at AC-branch

[glen]

Author: glen                         Date: Tue Sep  2 10:06:33 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge update to 4.2.52.5 from db at AC-branch

---- Files affected:
SPECS:
   db4.2.spec (1.80 -> 1.81) 

---- Diffs:

================================================================
Index: SPECS/db4.2.spec
diff -u SPECS/db4.2.spec:1.80 SPECS/db4.2.spec:1.81
--- SPECS/db4.2.spec:1.80	Sun Dec  9 02:27:55 2007
+++ SPECS/db4.2.spec	Tue Sep  2 12:06:27 2008
@@ -6,32 +6,32 @@
 %bcond_with	pmutex	# use POSIX mutexes (only process-private with linuxthreads)
 %bcond_with	nptl	# use process-shared POSIX mutexes (NPTL provides full interface)
 #
+%define		ver			4.2.52
+%define		patchlevel	5
+#
 %{?with_nptl:%define	with_pmutex	1}
 Summary:	Berkeley DB database library for C
 Summary(pl.UTF-8):	Biblioteka C do obsługi baz Berkeley DB
 Name:		db4.2
-Version:	4.2.52
+Version:	%{ver}.%{patchlevel}
 Release:	1
 License:	Sleepycat public license (GPL-like, see LICENSE)
 Group:		Libraries
 # alternative site (sometimes working): http://www.berkeleydb.com/
-#Source0Download: http://dev.sleepycat.com/downloads/releasehistorybdb.html
-Source0:	http://downloads.sleepycat.com/db-%{version}.tar.gz
+#Source0Download: http://www.sleepycat.com/download/
+Source0:	http://www.sleepycat.com/update/snapshot/db-%{ver}.tar.gz
 # Source0-md5:	cbc77517c9278cdb47613ce8cb55779f
+%patchset_source -f http://www.oracle.com/technology/products/berkeley-db/db/update/%{ver}/patch.%{ver}.%g 1 %{patchlevel}
 Patch0:		db-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/
+Patch1:		%{name}-amd64-fastmutex.patch
+URL:		http://www.oracle.com/technology/software/products/berkeley-db/db/index.html
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	ed
 %{?with_java:BuildRequires:	jdk}
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
-BuildRequires:	rpmbuild(macros) >= 1.164
+BuildRequires:	rpmbuild(macros) >= 1.426
 BuildRequires:	sed >= 4.0
 %{?with_tcl:BuildRequires:	tcl-devel >= 8.4.0}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -222,15 +222,15 @@
 poleceń.
 
 %prep
-%setup -q -n db-%{version}
+%setup -q -n db-%{ver}
+
+# official patches
+%patchset_patch 1 %{patchlevel}
+
 %patch0 -p1
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p1
+%patch1 -p1
 
-%if !%{with nptl}
+%if %{without nptl}
 sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
 %endif
 
@@ -323,6 +323,8 @@
 install -d $RPM_BUILD_ROOT%{_examplesdir}/db-java-%{version}
 cp -rf examples_java/* $RPM_BUILD_ROOT%{_examplesdir}/db-java-%{version}
 mv $RPM_BUILD_ROOT%{_libdir}/db.jar $RPM_BUILD_ROOT%{_javadir}
+%else
+rm -rf $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/java
 %endif
 
 %clean
@@ -421,6 +423,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2008/09/02 10:06:27  glen
+- merge update to 4.2.52.5 from db at AC-branch
+
 Revision 1.80  2007/12/09 01:27:55  glen
 - R: jpackage-utils for %{_javadir}
 
================================================================

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