rpms/compat-db/devel compat-db.spec, 1.33, 1.34 db-4.5.20-glibc.patch, 1.2, 1.3
Jindrich Novy
jnovy at fedoraproject.org
Wed Oct 22 12:48:58 UTC 2008
Author: jnovy
Update of /cvs/pkgs/rpms/compat-db/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20192
Modified Files:
compat-db.spec db-4.5.20-glibc.patch
Log Message:
* Wed Oct 22 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-5
- drop support for 4.3.29
- split compat-db to compat-db45, compat-db46 and -devel subpackages
to avoid dependency bloat (#459710)
- the -devel supackages now contain headers and db4?* utilities
Index: compat-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compat-db/devel/compat-db.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- compat-db.spec 16 Sep 2008 15:53:52 -0000 1.33
+++ compat-db.spec 22 Oct 2008 12:48:28 -0000 1.34
@@ -1,42 +1,36 @@
-%define db4_versions 4.3.29 4.5.20 4.6.21
+%define db45_version 4.5.20
+%define db46_version 4.6.21
+%define db4_versions %{db45_version} %{db46_version}
%define _libdb_a libdb-${soversion}.a
%define _libcxx_a libdb_cxx-${soversion}.a
-Summary: The Berkeley DB database library for Red Hat Linux 7.x compatibility
+Summary: The Berkeley DB database compatibility library
Name: compat-db
Version: 4.6.21
-Release: 4%{?dist}
-Source0: http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz
-Source1: http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz
-Source2: http://download.oracle.com/berkeley-db/db-4.6.21.tar.gz
+Release: 5%{?dist}
+Source0: http://download.oracle.com/berkeley-db/db-%{db45_version}.tar.gz
+Source1: http://download.oracle.com/berkeley-db/db-%{db46_version}.tar.gz
-Patch2: db-4.3.29-64bit.patch
Patch3: db-4.3.29-sparc64.patch
Patch4: db-4.5.20-glibc.patch
Patch5: db-4.6.21-1.85-compat.patch
-# Upstream db-4.3.29 patches
-Patch20: http://www.oracle.com/technology/products/berkeley-db/db/update/4.3.29/patch.4.3.29.1
-
# Upstream db-4.5.20 patches
-Patch30: http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1
-Patch31: http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2
+Patch30: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db45_version}/patch.%{db45_version}.1
+Patch31: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db45_version}/patch.%{db45_version}.2
# Upstream db-4.6.21 patches
-Patch40: http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.1
-Patch41: http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.2
+Patch40: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db46_version}/patch.%{db46_version}.1
+Patch41: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db46_version}/patch.%{db46_version}.2
-Obsoletes: db1, db1-devel
-Obsoletes: db2, db2-devel, db2-utils
-Obsoletes: db3, db3-devel, db3-utils
-Obsoletes: db31, db32, db3x
-Obsoletes: db4 < 4.6, db4-devel < 4.6, db4-utils < 4.6, db4-tcl < 4.6, db4-java < 4.6
URL: http://www.oracle.com/database/berkeley-db/
License: BSD
Group: System Environment/Libraries
BuildRequires: findutils, libtool, perl, sed, ed
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: compat-db45 = %{db45_version}-%{release}
+Requires: compat-db46 = %{db46_version}-%{release}
%description
The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
@@ -44,23 +38,72 @@
This package contains various versions of Berkeley DB which were included in
previous releases of Red Hat Linux.
-%prep
-%setup -q -c -a 1 -a 2
+%package -n compat-db45
+Summary: The Berkeley DB database %{db45_version} compatibility library
+Group: System Environment/Libraries
+Version: %{db45_version}
+Obsoletes: db1, db1-devel
+Obsoletes: db2, db2-devel, db2-utils
+Obsoletes: db3, db3-devel, db3-utils
+Obsoletes: db31, db32, db3x
+Obsoletes: db4 < 4.5, db4-devel < 4.5, db4-utils < 4.5, db4-tcl < 4.5, db4-java < 4.5
+Obsoletes: compat-db < 4.6.21-5
-pushd db-4.3.29
-%patch2 -p1 -b .64bit
-%patch3 -p1 -b .sparc64
-%patch5 -p1 -b .185compat
-%patch20 -p0
-popd
+%description -n compat-db45
+The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
+embedded database support for both traditional and client/server applications.
+This package contains Berkeley DB library version %{db45_version} used for compatibility.
+
+%package -n compat-db45-devel
+Summary: The Berkeley DB database %{db45_version} compatibility library development files
+Group: System Environment/Libraries
+Version: %{db45_version}
+Requires: compat-db45 = %{db45_version}-%{release}
+
+%description -n compat-db45-devel
+The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
+embedded database support for both traditional and client/server applications.
+This package contains Berkeley DB development library version %{db45_version} used for
+compatibility.
+
+%package -n compat-db46
+Summary: The Berkeley DB database %{db46_version} compatibility library
+Group: System Environment/Libraries
+Version: %{db46_version}
+Obsoletes: db1, db1-devel
+Obsoletes: db2, db2-devel, db2-utils
+Obsoletes: db3, db3-devel, db3-utils
+Obsoletes: db31, db32, db3x
+Obsoletes: db4 < 4.6, db4-devel < 4.6, db4-utils < 4.6, db4-tcl < 4.6, db4-java < 4.6
+Obsoletes: compat-db < 4.6.21-5
+
+%description -n compat-db46
+The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
+embedded database support for both traditional and client/server applications.
+This package contains Berkeley DB library version %{db46_version} used for compatibility.
+
+%package -n compat-db46-devel
+Summary: The Berkeley DB database %{db46_version} compatibility library development files
+Group: System Environment/Libraries
+Version: %{db46_version}
+Requires: compat-db46 = %{db46_version}-%{release}
-pushd db-4.5.20
+%description -n compat-db46-devel
+The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
+embedded database support for both traditional and client/server applications.
+This package contains Berkeley DB development library version %{db46_version} used for
+compatibility.
+
+%prep
+%setup -q -c -a 1
+
+pushd db-%{db45_version}
%patch30 -p0
%patch31 -p0
%patch3 -p1 -b .sparc64
popd
-pushd db-4.6.21
+pushd db-%{db46_version}
%patch40 -p0
%patch41 -p0
%patch3 -p1 -b .sparc64
@@ -85,9 +128,8 @@
for version in %{db4_versions} ; do
pushd db-${version}/dist
-# Link 4.1.25 and 4.2.52 against -lpthread
unset LIBSO_LIBS
- [ "$version" != "4.0.14" ] && export LIBSO_LIBS=-lpthread
+ export LIBSO_LIBS=-lpthread
# XXX --enable-posixmutexes is useful for threads but useless for interprocess locking.
# XXX --enable-diagnostic should be disabled for production (but is useful).
@@ -181,31 +223,48 @@
%files
%defattr(-,root,root)
-%doc docs/*
+
+%files -n compat-db45
+%doc docs/db-%{db45_version}
%ifos linux
-/%{_lib}/libdb-?.?.so
-/%{_lib}/libdb_cxx-?.?.so
+/%{_lib}/libdb-4.5.so
+/%{_lib}/libdb_cxx-4.5.so
%else
-%{_libdir}/libdb-?.?.so
-%{_libdir}/libdb_cxx-?.?.so
+%{_libdir}/libdb-4.5.so
+%{_libdir}/libdb_cxx-4.5.so
%endif
-%{_libdir}/db*
-%{_bindir}/berkeley_db*_svc
-%{_bindir}/db*_archive
-%{_bindir}/db*_checkpoint
-%{_bindir}/db*_deadlock
-%{_bindir}/db*_dump*
-%{_bindir}/db*_load
-%{_bindir}/db*_printlog
-%{_bindir}/db*_recover
-%{_bindir}/db*_stat
-%{_bindir}/db*_upgrade
-%{_bindir}/db*_verify
-%{_bindir}/db*_hotbackup
-%{_bindir}/db*_codegen
-%{_includedir}/*
+%{_libdir}/db%{db45_version}
+
+%files -n compat-db45-devel
+%defattr(-,root,root,-)
+%{_includedir}/db%{db45_version}
+%{_bindir}/db45*
+%{_bindir}/berkeley_db45_svc
+
+%files -n compat-db46
+%doc docs/db-%{db46_version}
+%ifos linux
+/%{_lib}/libdb-4.6.so
+/%{_lib}/libdb_cxx-4.6.so
+%else
+%{_libdir}/libdb-4.6.so
+%{_libdir}/libdb_cxx-4.6.so
+%endif
+%{_libdir}/db%{db46_version}
+
+%files -n compat-db46-devel
+%defattr(-,root,root,-)
+%{_includedir}/db%{db46_version}
+%{_bindir}/db46*
+%{_bindir}/berkeley_db46_svc
%changelog
+* Wed Oct 22 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-5
+- drop support for 4.3.29
+- split compat-db to compat-db45, compat-db46 and -devel subpackages
+ to avoid dependency bloat (#459710)
+- the -devel supackages now contain headers and db4?* utilities
+
* Tue Sep 16 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-4
- build also if db4 is not installed (thanks to Michael A. Peters)
db-4.5.20-glibc.patch:
Index: db-4.5.20-glibc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/compat-db/devel/db-4.5.20-glibc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- db-4.5.20-glibc.patch 9 Jul 2008 06:39:42 -0000 1.2
+++ db-4.5.20-glibc.patch 22 Oct 2008 12:48:28 -0000 1.3
@@ -364,25 +364,3 @@
goto err;
/* Create the mapping. */
---- compat-db-4.5.20/db-4.3.29/dbm/dbm.c.glibc 2004-05-12 16:10:59.000000000 +0200
-+++ compat-db-4.5.20/db-4.3.29/dbm/dbm.c 2007-08-13 13:46:45.000000000 +0200
-@@ -235,7 +235,7 @@ __db_ndbm_open(file, oflags, mode)
- if ((ret = dbp->set_pagesize(dbp, 4096)) != 0 ||
- (ret = dbp->set_h_ffactor(dbp, 40)) != 0 ||
- (ret = dbp->set_h_nelem(dbp, 1)) != 0 ||
-- (ret = dbp->open(dbp, NULL,
-+ (ret = (dbp->open)(dbp, NULL,
- path, NULL, DB_HASH, __db_oflags(oflags), mode)) != 0) {
- __os_set_errno(ret);
- return (NULL);
---- compat-db-4.5.20/db-4.3.29/db185/db185.c.glibc 2007-08-13 13:46:45.000000000 +0200
-+++ compat-db-4.5.20/db-4.3.29/db185/db185.c 2007-08-13 13:46:45.000000000 +0200
-@@ -230,7 +230,7 @@ __db185_open(file, oflags, mode, type, o
- dbp->api_internal = db185p;
-
- /* Open the database. */
-- if ((ret = dbp->open(dbp, NULL,
-+ if ((ret = (dbp->open)(dbp, NULL,
- file, NULL, type, __db_oflags(oflags), mode)) != 0)
- goto err;
-
More information about the scm-commits
mailing list