rpms/compat-db/F-13 LICENSE,NONE,1.1 compat-db.spec,1.44,1.45

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/compat-db/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7855

Modified Files:
	compat-db.spec 
Added Files:
	LICENSE 
Log Message:
* Mon Jul 12 2010 Jindrich Novy <jnovy at redhat.com> 4.7.25-4
- move noarch files to noarch subpackage to avoid conflicts
  on multiarch systems (#590973)



***** Error reading new file: [Errno 2] No such file or directory: 'LICENSE'

Index: compat-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compat-db/F-13/compat-db.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- compat-db.spec	17 Jun 2010 07:43:55 -0000	1.44
+++ compat-db.spec	12 Jul 2010 08:12:45 -0000	1.45
@@ -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: 3%{?dist}
+Version: %{main_version}
+Release: 4%{?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,
 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 tradi
 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
@@ -66,6 +82,7 @@ This package contains Berkeley DB librar
 %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
@@ -82,6 +99,7 @@ This package contains Berkeley DB librar
 %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
@@ -128,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"
@@ -219,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}
@@ -232,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)
@@ -247,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)
@@ -262,9 +286,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libdb_cxx-4.7.so
 %endif
 %{_libdir}/db%{db47_version}
-%{_includedir}/db%{db47_version}
 
 %changelog
+* Mon Jul 12 2010 Jindrich Novy <jnovy at redhat.com> 4.7.25-4
+- move noarch files to noarch subpackage to avoid conflicts
+  on multiarch systems (#590973)
+
 * Thu Jun 17 2010 Jindrich Novy <jnovy at redhat.com> 4.7.25-3
 - fix dependencies on multiarch systems (#590973)
 - compile with -fno-strict-aliasing