rpms/db4/devel .cvsignore, 1.13, 1.14 db4.spec, 1.58, 1.59 sources, 1.13, 1.14 db-4.6.18-glibc.patch, 1.1, NONE patch.4.6.21.1, 1.1, NONE

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/db4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30543

Modified Files:
	.cvsignore db4.spec sources 
Removed Files:
	db-4.6.18-glibc.patch patch.4.6.21.1 
Log Message:
* Wed Jul  9 2008 Jindrich Novy <jnovy at redhat.com> 4.7.25-1
- update to 4.7.25
- package static java library only if listed in java_arches
- move to java-1.6.0-openjdk
- fix tcl library path
- drop glibc patch, no more needed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/db4/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	11 Oct 2007 13:52:59 -0000	1.13
+++ .cvsignore	9 Jul 2008 06:54:45 -0000	1.14
@@ -8,3 +8,4 @@
 db-4.6.18.tar.gz
 db-4.6.19.tar.gz
 db-4.6.21.tar.gz
+db-4.7.25.tar.gz


Index: db4.spec
===================================================================
RCS file: /cvs/extras/rpms/db4/devel/db4.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- db4.spec	19 May 2008 09:02:33 -0000	1.58
+++ db4.spec	9 Jul 2008 06:54:45 -0000	1.59
@@ -1,21 +1,19 @@
 # the set of arches on which libgcj provides gcj and libgcj-javac-placeholder.sh
 %define java_arches %{ix86} alpha ia64 ppc s390 s390x sparc sparcv9 x86_64
-%define __soversion 4.6
+%define __soversion 4.7
 
 Summary: The Berkeley DB database library (version 4) for C
 Name: db4
-Version: 4.6.21
-Release: 6%{?dist}
+Version: 4.7.25
+Release: 1%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
-Patch1: http://www.oracle.com/technology/products/berkeley-db/xml/update/4.6.21/patch.4.6.21.1
 Patch2: db-4.3.29-sparc64.patch
 Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.1
 Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.2
 Patch12: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.3
 Patch13: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.4
 Patch14: db-1.85-errno.patch
-Patch20: db-4.6.18-glibc.patch
 Patch22: db-4.5.20-jni-include-dir.patch
 URL: http://www.oracle.com/database/berkeley-db/
 License: BSD
@@ -24,8 +22,7 @@
 BuildRequires: perl, libtool, ed, tcl-devel >= 8.4.4, util-linux-ng
 %ifarch %{java_arches}
 BuildRequires: gcc-java
-BuildRequires: java-1.5.0-gcj
-BuildRequires: java-1.5.0-gcj-devel
+BuildRequires: java-1.6.0-openjdk-devel
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -115,7 +112,6 @@
 
 %prep
 %setup -q -n db-%{version} -a 1
-%patch1 -p0 -b .4.6.21.1
 %patch2 -p1 -b .sparc64
 
 pushd dist
@@ -132,7 +128,6 @@
 %patch14 -p1 -b .errno
 popd
 
-%patch20 -p1 -b .glibc
 %patch22 -p1 -b .4.5.20.jni
 
 # Remove tags files which we don't need.
@@ -187,6 +182,8 @@
 	/bin/sh libtool --mode=compile %{__cc} $RPM_OPT_FLAGS -Idb.1.85/PORT/%{_os}/include -D_REENTRANT -c db_dump185/db_dump185.c -o dist/$1/db_dump185.lo
 	/bin/sh libtool --mode=link    %{__cc} -o dist/$1/db_dump185 dist/$1/db_dump185.lo db.1.85/PORT/%{_os}/libdb.a
 
+	pushd dist
+	popd
 	pushd dist/$1
 	ln -sf ../configure .
 	# XXX --enable-diagnostic should be disabled for production (but is
@@ -203,6 +200,7 @@
 		--disable-java \
 %endif
 		--enable-test \
+		--with-tcl=%{_libdir}/tcl8.5 \
 		# --enable-diagnostic \
 		# --enable-debug --enable-debug_rop --enable-debug_wop \
 
@@ -348,7 +346,9 @@
 %{_libdir}/libdb-%{__soversion}.a
 %{_libdir}/libdb_cxx-%{__soversion}.a
 %{_libdir}/libdb_tcl-%{__soversion}.a
+%ifarch %{java_arches}
 %{_libdir}/libdb_java-%{__soversion}.a
+%endif
 
 %files tcl
 %defattr(-,root,root)
@@ -364,6 +364,13 @@
 %endif
 
 %changelog
+* Wed Jul  9 2008 Jindrich Novy <jnovy at redhat.com> 4.7.25-1
+- update to 4.7.25
+- package static java library only if listed in java_arches
+- move to java-1.6.0-openjdk
+- fix tcl library path
+- drop glibc patch, no more needed
+
 * Sat May 17 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-6
 - fix license, remove .la files (#225675)
 - move static libraries to separate package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/db4/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	11 Oct 2007 13:52:59 -0000	1.13
+++ sources	9 Jul 2008 06:54:45 -0000	1.14
@@ -1,2 +1,3 @@
 42cc6c1e1e25818bd3e3f91328edb0f1  db.1.85.tar.gz
 718082e7e35fc48478a2334b0bc4cd11  db-4.6.21.tar.gz
+ec2b87e833779681a0c3a814aa71359e  db-4.7.25.tar.gz


--- db-4.6.18-glibc.patch DELETED ---


--- patch.4.6.21.1 DELETED ---