rpms/compat-db/F-12 .cvsignore, 1.15, 1.16 compat-db.spec, 1.40, 1.41 sources, 1.16, 1.17 patch.4.1.25.1, 1.1, NONE patch.4.1.25.2, 1.1, NONE patch.4.1.25.3, 1.1, NONE patch.4.2.52.1, 1.3, NONE patch.4.2.52.2, 1.3, NONE patch.4.2.52.3, 1.3, NONE patch.4.2.52.4, 1.3, NONE patch.4.2.52.5, 1.3, NONE patch.4.3.29.1, 1.3, NONE
Jindrich Novy
jnovy at fedoraproject.org
Fri Oct 23 04:54:20 UTC 2009
- Previous message (by thread): rpms/ibus-table/F-11 ibus-table.spec,1.23,1.24
- Next message (by thread): rpms/iksemel/devel 0001-Fix-issues-compiling-with-newer-gnutls.patch, NONE, 1.1 0002-Strip-out-internal-SHA-code-and-use-functions-from-g.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 iksemel.spec, 1.15, 1.16 sources, 1.3, 1.4 iksemel-64bit.patch, 1.2, NONE iksemel-gcrypt-sha.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jnovy
Update of /cvs/pkgs/rpms/compat-db/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25607
Modified Files:
.cvsignore compat-db.spec sources
Removed Files:
patch.4.1.25.1 patch.4.1.25.2 patch.4.1.25.3 patch.4.2.52.1
patch.4.2.52.2 patch.4.2.52.3 patch.4.2.52.4 patch.4.2.52.5
patch.4.3.29.1
Log Message:
* Thu Sep 10 2009 Jindrich Novy <jnovy at redhat.com> 4.6.21-6
- remove libtool hacks so that compat-db builds again
- remove support for old BDBs: 4.3.29, 4.2.52, 4.1.25
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compat-db/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore 13 Nov 2008 16:58:53 -0000 1.15
+++ .cvsignore 23 Oct 2009 04:54:19 -0000 1.16
@@ -1,5 +1,2 @@
db-4.5.20.tar.gz
db-4.6.21.tar.gz
-db-4.1.25.tar.gz
-db-4.2.52.tar.gz
-db-4.3.29.tar.gz
Index: compat-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compat-db/F-12/compat-db.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- compat-db.spec 24 Jul 2009 19:16:42 -0000 1.40
+++ compat-db.spec 23 Oct 2009 04:54:19 -0000 1.41
@@ -1,9 +1,6 @@
-%define db41_version 4.1.25
-%define db42_version 4.2.52
-%define db43_version 4.3.29
%define db45_version 4.5.20
%define db46_version 4.6.21
-%define db4_versions %{db41_version} %{db42_version} %{db43_version} %{db45_version} %{db46_version}
+%define db4_versions %{db45_version} %{db46_version}
%define _libdb_a libdb-${soversion}.a
%define _libcxx_a libdb_cxx-${soversion}.a
@@ -11,32 +8,14 @@
Summary: The Berkeley DB database compatibility library
Name: compat-db
Version: 4.6.21
-Release: 9%{?dist}
-Source0: http://download.oracle.com/berkeley-db/db-%{db41_version}.tar.gz
-Source1: http://download.oracle.com/berkeley-db/db-%{db42_version}.tar.gz
-Source2: http://download.oracle.com/berkeley-db/db-%{db43_version}.tar.gz
-Source3: http://download.oracle.com/berkeley-db/db-%{db45_version}.tar.gz
-Source4: http://download.oracle.com/berkeley-db/db-%{db46_version}.tar.gz
+Release: 10%{?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
Patch3: db-4.5.20-sparc64.patch
Patch4: db-4.5.20-glibc.patch
Patch5: db-4.6.21-1.85-compat.patch
-# Upstream db-4.1.25 patches
-Patch0: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db41_version}/patch.%{db41_version}.1
-Patch1: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db41_version}/patch.%{db41_version}.2
-Patch2: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db41_version}/patch.%{db41_version}.3
-
-# Upstream db-4.2.52 patches
-Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.1
-Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.2
-Patch12: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.3
-Patch13: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.4
-Patch14: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db42_version}/patch.%{db42_version}.5
-
-# Upstream db-4.3.29 patches
-Patch20: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db43_version}/patch.%{db43_version}.1
-
# Upstream db-4.5.20 patches
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
@@ -44,7 +23,6 @@ Patch31: http://www.oracle.com/technolog
# Upstream db-4.6.21 patches
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
-Patch42: http://www.oracle.com/technology/products/berkeley-db/db/update/%{db46_version}/patch.%{db46_version}.3
URL: http://www.oracle.com/database/berkeley-db/
License: BSD
@@ -60,54 +38,6 @@ embedded database support for both tradi
This package contains various versions of Berkeley DB which were included in
previous releases of Red Hat Linux.
-%package -n compat-db41
-Summary: The Berkeley DB database %{db41_version} compatibility library
-Group: System Environment/Libraries
-Version: %{db41_version}
-Obsoletes: db1, db1-devel
-Obsoletes: db2, db2-devel, db2-utils
-Obsoletes: db3, db3-devel, db3-utils
-Obsoletes: db31, db32, db3x
-Obsoletes: db4 < 4.1, db4-devel < 4.1, db4-utils < 4.1, db4-tcl < 4.1, db4-java < 4.1
-Obsoletes: compat-db < 4.6.21-5
-
-%description -n compat-db41
-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 %{db41_version} used for compatibility.
-
-%package -n compat-db42
-Summary: The Berkeley DB database %{db42_version} compatibility library
-Group: System Environment/Libraries
-Version: %{db42_version}
-Obsoletes: db1, db1-devel
-Obsoletes: db2, db2-devel, db2-utils
-Obsoletes: db3, db3-devel, db3-utils
-Obsoletes: db31, db32, db3x
-Obsoletes: db4 < 4.2, db4-devel < 4.2, db4-utils < 4.2, db4-tcl < 4.2, db4-java < 4.2
-Obsoletes: compat-db < 4.6.21-5
-
-%description -n compat-db42
-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 %{db42_version} used for compatibility.
-
-%package -n compat-db43
-Summary: The Berkeley DB database %{db43_version} compatibility library
-Group: System Environment/Libraries
-Version: %{db43_version}
-Obsoletes: db1, db1-devel
-Obsoletes: db2, db2-devel, db2-utils
-Obsoletes: db3, db3-devel, db3-utils
-Obsoletes: db31, db32, db3x
-Obsoletes: db4 < 4.3, db4-devel < 4.3, db4-utils < 4.3, db4-tcl < 4.3, db4-java < 4.3
-Obsoletes: compat-db < 4.6.21-5
-
-%description -n compat-db43
-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 %{db43_version} used for compatibility.
-
%package -n compat-db45
Summary: The Berkeley DB database %{db45_version} compatibility library
Group: System Environment/Libraries
@@ -141,26 +71,7 @@ embedded database support for both tradi
This package contains Berkeley DB library version %{db46_version} used for compatibility.
%prep
-%setup -q -c -a 1 -a 2 -a 3 -a 4
-
-pushd db-%{db41_version}
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-popd
-
-pushd db-%{db42_version}
-%patch10 -p0
-%patch11 -p0
-%patch12 -p0
-%patch13 -p0
-%patch14 -p0
-popd
-
-pushd db-%{db43_version}
-%patch20 -p0
-%patch3 -p1 -b .sparc64
-popd
+%setup -q -c -a 1
pushd db-%{db45_version}
%patch30 -p0
@@ -171,7 +82,6 @@ popd
pushd db-%{db46_version}
%patch40 -p0
%patch41 -p0
-%patch42 -p0
%patch3 -p1 -b .sparc64
popd
@@ -184,25 +94,8 @@ for version in %{db4_versions} ; do
done
%build
-# Set CFLAGS for use when building db2, where there's no configure script to
-# pick it up from a %%configure macro.
-CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
-
-# Cause C++ libraries to be linked with libstdc++.
-LIBXSO_LIBS=-lstdc++; export LIBXSO_LIBS
-
for version in %{db4_versions} ; do
pushd db-${version}/dist
-
- unset LIBSO_LIBS
- 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).
-# XXX --enable-debug_{r,w}op should be disabled for production.
-# XXX --enable-java
- libtoolize --copy --force
- cp -f %{_datadir}/aclocal/libtool.m4 aclocal/libtool.ac
./s_config
mkdir build_unix
cd build_unix
@@ -211,11 +104,7 @@ for version in %{db4_versions} ; do
--enable-compat185 \
--enable-shared --disable-static \
--enable-rpc \
- --enable-cxx \
- # --enable-diagnostic \
- # --enable-debug --enable-debug_rop --enable-debug_wop \
- # --enable-posixmutexes
-
+ --enable-cxx
soversion=`echo ${version} | cut -f1,2 -d.`
make libdb=%{_libdb_a} libcxx=%{_libcxx_a} %{?_smp_mflags}
popd
@@ -254,8 +143,6 @@ ${RPM_BUILD_ROOT}%{_includedir}/db.h \
${RPM_BUILD_ROOT}%{_includedir}/db_185.h \
${RPM_BUILD_ROOT}%{_includedir}/db_cxx.h
-# Nuke useless headers for 4.1.25
-rm -f ${RPM_BUILD_ROOT}%{_includedir}/cxx_common.h ${RPM_BUILD_ROOT}%{_includedir}/cxx_except.h
# Make sure all shared libraries have the execute bit set.
chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/libdb*.so*
@@ -295,48 +182,6 @@ rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(-,root,root)
-%files -n compat-db41
-%doc docs/db-%{db41_version}
-%{_bindir}/db41*
-%{_bindir}/berkeley_db41_svc
-%ifos linux
-/%{_lib}/libdb-4.1.so
-/%{_lib}/libdb_cxx-4.1.so
-%else
-%{_libdir}/libdb-4.1.so
-%{_libdir}/libdb_cxx-4.1.so
-%endif
-%{_libdir}/db%{db41_version}
-%{_includedir}/db%{db41_version}
-
-%files -n compat-db42
-%doc docs/db-%{db42_version}
-%{_bindir}/db42*
-%{_bindir}/berkeley_db42_svc
-%ifos linux
-/%{_lib}/libdb-4.2.so
-/%{_lib}/libdb_cxx-4.2.so
-%else
-%{_libdir}/libdb-4.2.so
-%{_libdir}/libdb_cxx-4.2.so
-%endif
-%{_libdir}/db%{db42_version}
-%{_includedir}/db%{db42_version}
-
-%files -n compat-db43
-%doc docs/db-%{db43_version}
-%{_bindir}/db43*
-%{_bindir}/berkeley_db43_svc
-%ifos linux
-/%{_lib}/libdb-4.3.so
-/%{_lib}/libdb_cxx-4.3.so
-%else
-%{_libdir}/libdb-4.3.so
-%{_libdir}/libdb_cxx-4.3.so
-%endif
-%{_libdir}/db%{db43_version}
-%{_includedir}/db%{db43_version}
-
%files -n compat-db45
%doc docs/db-%{db45_version}
%{_bindir}/db45*
@@ -366,6 +211,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_includedir}/db%{db46_version}
%changelog
+* Thu Sep 10 2009 Jindrich Novy <jnovy at redhat.com> 4.6.21-6
+- remove libtool hacks so that compat-db builds again
+- remove support for old BDBs: 4.3.29, 4.2.52, 4.1.25
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.21-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compat-db/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources 13 Nov 2008 16:58:53 -0000 1.16
+++ sources 23 Oct 2009 04:54:19 -0000 1.17
@@ -1,5 +1,2 @@
-d82ed75cb53b0daba4a7e959e8a6f86c db-4.1.25.tar.gz
-8b5cff6eb83972afdd8e0b821703c33c db-4.2.52.tar.gz
-200b9f5d74175875fcb3ee54adbf0007 db-4.3.29.tar.gz
b0f1c777708cb8e9d37fb47e7ed3312d db-4.5.20.tar.gz
718082e7e35fc48478a2334b0bc4cd11 db-4.6.21.tar.gz
--- patch.4.1.25.1 DELETED ---
--- patch.4.1.25.2 DELETED ---
--- patch.4.1.25.3 DELETED ---
--- patch.4.2.52.1 DELETED ---
--- patch.4.2.52.2 DELETED ---
--- patch.4.2.52.3 DELETED ---
--- patch.4.2.52.4 DELETED ---
--- patch.4.2.52.5 DELETED ---
--- patch.4.3.29.1 DELETED ---
- Previous message (by thread): rpms/ibus-table/F-11 ibus-table.spec,1.23,1.24
- Next message (by thread): rpms/iksemel/devel 0001-Fix-issues-compiling-with-newer-gnutls.patch, NONE, 1.1 0002-Strip-out-internal-SHA-code-and-use-functions-from-g.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 iksemel.spec, 1.15, 1.16 sources, 1.3, 1.4 iksemel-64bit.patch, 1.2, NONE iksemel-gcrypt-sha.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list