[compat-db] introduce headers subpackage, fix upgrade path and install license
Jindrich Novy
jnovy at fedoraproject.org
Thu Aug 26 05:24:12 UTC 2010
commit c347f4010f4bf8c84cd06ede2f5a92524e1c38aa
Author: Jindrich Novy <jnovy at redhat.com>
Date: Thu Aug 26 07:23:48 2010 +0200
introduce headers subpackage, fix upgrade path and install license
LICENSE | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
compat-db.spec | 45 +++++++++++++++-----
2 files changed, 164 insertions(+), 11 deletions(-)
---
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d5a66e3
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,130 @@
+/*-
+ * $Id: LICENSE,v 12.9 2008/02/07 17:12:17 mark Exp $
+ */
+
+The following is the license that applies to this copy of the Berkeley DB
+software. For a license to use the Berkeley DB software under conditions
+other than those described here, or to purchase support for this software,
+please contact Oracle at berkeleydb-info_us at oracle.com.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+/*
+ * Copyright (c) 1990,2008 Oracle. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Redistributions in any form must be accompanied by information on
+ * how to obtain complete source code for the DB software and any
+ * accompanying software that uses the DB software. The source code
+ * must either be included in the distribution or be available for no
+ * more than the cost of distribution plus a nominal fee, and must be
+ * freely redistributable under reasonable conditions. For an
+ * executable file, complete source code means the source code for all
+ * modules it contains. It does not include source code for modules or
+ * files that typically accompany the major components of the operating
+ * system on which the executable file runs.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ORACLE ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
+ * NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL ORACLE BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * Copyright (c) 1990, 1993, 1994, 1995
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+/*
+ * Copyright (c) 1995, 1996
+ * The President and Fellows of Harvard University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2005 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
diff --git a/compat-db.spec b/compat-db.spec
index 2358ca6..fda8dc4 100644
--- a/compat-db.spec
+++ b/compat-db.spec
@@ -2,17 +2,20 @@
%define db46_version 4.6.21
%define db47_version 4.7.25
%define db4_versions %{db45_version} %{db46_version} %{db47_version}
+%define main_version %{db47_version}
%define _libdb_a libdb-${soversion}.a
%define _libcxx_a libdb_cxx-${soversion}.a
Summary: The Berkeley DB database compatibility library
Name: compat-db
-Version: 4.7.25
-Release: 17%{?dist}
+Version: %{main_version}
+Release: 18%{?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
Source2: http://download.oracle.com/berkeley-db/db-%{db47_version}.tar.gz
+# license text extracted from tarball
+Source3: LICENSE
Patch3: db-4.5.20-sparc64.patch
Patch4: db-4.5.20-glibc.patch
@@ -40,6 +43,7 @@ BuildRequires: findutils, libtool, perl, sed, ed
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: compat-db45%{?_isa} = %{db45_version}-%{release}
Requires: compat-db46%{?_isa} = %{db46_version}-%{release}
+Requires: compat-db47%{?_isa} = %{db47_version}-%{release}
%description
The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
@@ -47,9 +51,21 @@ embedded database support for both traditional and client/server applications.
This package contains various versions of Berkeley DB which were included in
previous releases of Red Hat Linux.
+%package -n compat-db-headers
+Summary: The Berkeley DB database compatibility headers
+Group: System Environment/Libraries
+BuildArch: noarch
+Obsoletes: db4 < 4.5, db4-devel < 4.5, db4-utils < 4.5, db4-tcl < 4.5, db4-java < 4.5
+
+%description -n compat-db-headers
+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 headers used for compatibility.
+
%package -n compat-db45
Summary: The Berkeley DB database %{db45_version} compatibility library
Group: System Environment/Libraries
+Requires: compat-db-headers = %{main_version}-%{release}
Version: %{db45_version}
Obsoletes: db1, db1-devel
Obsoletes: db2, db2-devel, db2-utils
@@ -57,8 +73,6 @@ 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
-Obsoletes: compat-db-headers < 4.7.25-16
-Provides: compat-db-header = %{version}-%{release}
%description -n compat-db45
The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
@@ -68,6 +82,7 @@ This package contains Berkeley DB library version %{db45_version} used for compa
%package -n compat-db46
Summary: The Berkeley DB database %{db46_version} compatibility library
Group: System Environment/Libraries
+Requires: compat-db-headers = %{main_version}-%{release}
Version: %{db46_version}
Obsoletes: db1, db1-devel
Obsoletes: db2, db2-devel, db2-utils
@@ -75,8 +90,6 @@ 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
-Obsoletes: compat-db-headers < 4.7.25-16
-Provides: compat-db-header = %{version}-%{release}
%description -n compat-db46
The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
@@ -86,6 +99,7 @@ This package contains Berkeley DB library version %{db46_version} used for compa
%package -n compat-db47
Summary: The Berkeley DB database %{db46_version} compatibility library
Group: System Environment/Libraries
+Requires: compat-db-headers = %{main_version}-%{release}
Version: %{db47_version}
Obsoletes: db1, db1-devel
Obsoletes: db2, db2-devel, db2-utils
@@ -93,8 +107,6 @@ Obsoletes: db3, db3-devel, db3-utils
Obsoletes: db31, db32, db3x
Obsoletes: db4 < 4.7, db4-devel < 4.7, db4-utils < 4.7, db4-tcl < 4.7, db4-java < 4.7
Obsoletes: compat-db < 4.6.21-5
-Obsoletes: compat-db-headers < 4.7.25-16
-Provides: compat-db-header = %{version}-%{release}
%description -n compat-db47
The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
@@ -134,6 +146,7 @@ for version in %{db4_versions} ; do
mkdir docs/db-${version}
install -m644 db*${version}/{README,LICENSE} docs/db-${version}
done
+cp %{SOURCE3} .
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -225,6 +238,13 @@ rm -rf ${RPM_BUILD_ROOT}
%files
%defattr(-,root,root)
+%files -n compat-db-headers
+%defattr(-,root,root)
+%doc LICENSE
+%{_includedir}/db%{db45_version}
+%{_includedir}/db%{db46_version}
+%{_includedir}/db%{db47_version}
+
%files -n compat-db45
%defattr(-,root,root)
%doc docs/db-%{db45_version}
@@ -238,7 +258,6 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/libdb_cxx-4.5.so
%endif
%{_libdir}/db%{db45_version}
-%{_includedir}/db%{db45_version}
%files -n compat-db46
%defattr(-,root,root)
@@ -253,7 +272,6 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/libdb_cxx-4.6.so
%endif
%{_libdir}/db%{db46_version}
-%{_includedir}/db%{db46_version}
%files -n compat-db47
%defattr(-,root,root)
@@ -268,9 +286,14 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/libdb_cxx-4.7.so
%endif
%{_libdir}/db%{db47_version}
-%{_includedir}/db%{db47_version}
%changelog
+* Thu Aug 26 2010 Jindrich Novy <jnovy at redhat.com> 4.7.25-18
+- really fix the update path (#627019, #627387)
+- introduce -headers subpackage to avoid conflicts on multiarch
+ systems (#590973)
+- install package license
+
* Wed Aug 25 2010 Jochen Schmitt <Jochen herr-schmitt de> 4.7.25-17
- Fix broken update path (#627019)
More information about the scm-commits
mailing list