rpms/db4/devel .cvsignore, 1.9, 1.10 db4.spec, 1.40, 1.41 sources, 1.9, 1.10 db-4.3.29-64bit.patch, 1.1, NONE

Fri Nov 10 18:00:18 UTC 2006

Author: jnovy

Update of /cvs/dist/rpms/db4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31278

Modified Files:
	.cvsignore db4.spec sources 
Removed Files:
	db-4.3.29-64bit.patch 
Log Message:
- update to db-4.5.20 (#198038)
- fix BuildRoot
- drop .64bit patch
- patch/source URLs now point to correct location
Resolves: 198038



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/db4/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10

--- .cvsignore	7 Oct 2005 18:02:45 -0000	1.9
+++ .cvsignore	10 Nov 2006 18:00:10 -0000	1.10
@@ -4,3 +4,4 @@
 db-4.3.27.tar.gz
 db-4.3.28.tar.gz
 db-4.3.29.tar.gz
+db-4.5.20.tar.gz


Index: db4.spec
===================================================================
RCS file: /cvs/dist/rpms/db4/devel/db4.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- db4.spec	12 Sep 2006 16:06:33 -0000	1.40
+++ db4.spec	10 Nov 2006 18:00:10 -0000	1.41
@@ -1,29 +1,25 @@
 # the set of arches on which libgcj provides gcj and libgcj-javac-placeholder.sh
 %define java_arches %{ix86} alpha ia64 ppc ppc64 s390 s390x sparc sparcv9 x86_64
 
-# compatibility with legacy versions of rpm
-%{!?_lib:%define _lib	lib}
-
-%define	__soversion	4.3
+%define	__soversion	4.5
 %define	_libdb_a	libdb-%{__soversion}.a
 %define	_libcxx_a	libdb_cxx-%{__soversion}.a
 
 Summary: The Berkeley DB database library (version 4) for C.
 Name: db4
-Version: 4.3.29
-Release: 9%{?dist}
-Source: http://www.sleepycat.com/update/%{version}/db-%{version}.tar.gz
-Source1: http://www.sleepycat.com/update/1.85/db.1.85.tar.gz
+Version: 4.5.20
+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
 Source2: nptl-abi-note.S
-Patch1: db-4.3.29-64bit.patch
-Patch2: db-4.2.52-gcj.patch
-Patch3: db-4.3.29-sparc64.patch
-Patch10: http://www.sleepycat.com/update/1.85/patch.1.1
-Patch11: http://www.sleepycat.com/update/1.85/patch.1.2
-Patch12: http://www.sleepycat.com/update/1.85/patch.1.3
-Patch13: http://www.sleepycat.com/update/1.85/patch.1.4
+Patch1: db-4.2.52-gcj.patch
+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
-URL: http://www.sleepycat.com/
+URL: http://www.oracle.com/database/berkeley-db/
 License: GPL
 Group: System Environment/Libraries
 Obsoletes: db1, db2, db3
@@ -33,7 +29,7 @@
 BuildRequires: java-1.4.2-gcj-compat
 BuildRequires: java-1.4.2-gcj-compat-devel
 %endif
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -99,9 +95,8 @@
 
 %prep
 %setup -q -n db-%{version} -a 1
-%patch1 -p1 -b .64bit
-%patch2 -p1 -b .gcj
-%patch3 -p1 -b .sparc64
+%patch1 -p1 -b .gcj
+%patch2 -p1 -b .sparc64
 
 pushd dist
 libtoolize --copy --force
@@ -128,18 +123,16 @@
             -e 's,="api_c/,="../%{name}-devel-%{version}/api_c/,g' \
             -e 's,="../api_cxx/,="../../%{name}-devel-%{version}/api_cxx/,g' \
             -e 's,="api_cxx/,="../%{name}-devel-%{version}/api_cxx/,g' \
-            -e 's,="../api_java/,="../../%{name}-devel-%{version}/api_java/,g' \
-            -e 's,="api_java/,="../%{name}-devel-%{version}/api_java/,g' \
             -e 's,="../api_tcl/,="../../%{name}-devel-%{version}/api_tcl/,g' \
             -e 's,="api_tcl/,="../%{name}-devel-%{version}/api_tcl/,g' \
+            -e 's,="../java/,="../../%{name}-devel-%{version}/java/,g' \
+            -e 's,="java/,="../%{name}-devel-%{version}/java/,g' \
             -e 's,="../examples_c/,="../../%{name}-devel-%{version}/examples_c/,g' \
             -e 's,="examples_c/,="../%{name}-devel-%{version}/examples_c/,g' \
             -e 's,="../examples_cxx/,="../../%{name}-devel-%{version}/examples_cxx/,g' \
             -e 's,="examples_cxx/,="../%{name}-devel-%{version}/examples_cxx/,g' \
             -e 's,="../ref/,="../../%{name}-devel-%{version}/ref/,g' \
             -e 's,="ref/,="../%{name}-devel-%{version}/ref/,g' \
-            -e 's,="../sleepycat/,="../../%{name}-devel-%{version}/sleepycat/,g' \
-            -e 's,="sleepycat/,="../%{name}-devel-%{version}/sleepycat/,g' \
             -e 's,="../images/,="../../%{name}-devel-%{version}/images/,g' \
             -e 's,="images/,="../%{name}-devel-%{version}/images/,g' \
             -e 's,="../utility/,="../../%{name}-utils-%{version}/utility/,g' \
@@ -322,11 +315,12 @@
 %{_bindir}/db*_stat
 %{_bindir}/db*_upgrade
 %{_bindir}/db*_verify
+%{_bindir}/db*_hotbackup
 
 %files devel
 %defattr(-,root,root)
 %doc	docs/api_c docs/api_cxx docs/api_tcl docs/index.html
-%doc	docs/ref docs/sleepycat docs/images
+%doc	docs/ref docs/images
 %doc	examples_c examples_cxx
 %{_libdir}/libdb.so
 %{_libdir}/libdb_cxx.so
@@ -353,6 +347,12 @@
 %endif
 
 %changelog
+* Fri Nov 10 2006 Jindrich Novy <jnovy at redhat.com> 4.5.20-1
+- update to db-4.5.20 (#198038)
+- fix BuildRoot
+- drop .64bit patch
+- patch/source URLs now point to correct location
+
 * Tue Sep 12 2006 Jindrich Novy <jnovy at redhat.com> 4.3.29-9
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/db4/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Oct 2005 18:02:45 -0000	1.9
+++ sources	10 Nov 2006 18:00:10 -0000	1.10
@@ -1,2 +1,2 @@
 42cc6c1e1e25818bd3e3f91328edb0f1  db.1.85.tar.gz
-13585a20ce32f113b8e8cdb57f52e3bb  db-4.3.29.tar.gz
+b0f1c777708cb8e9d37fb47e7ed3312d  db-4.5.20.tar.gz


--- db-4.3.29-64bit.patch DELETED ---


