rpms/db4/devel db4.spec,1.57,1.58

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/db4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31191

Modified Files:
	db4.spec 
Log Message:
* Sat May 17 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-6
- fix license, remove .la files (#225675)
- move static libraries to separate package



Index: db4.spec
===================================================================
RCS file: /cvs/extras/rpms/db4/devel/db4.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- db4.spec	4 Apr 2008 08:32:54 -0000	1.57
+++ db4.spec	19 May 2008 09:02:33 -0000	1.58
@@ -1,14 +1,11 @@
 # the set of arches on which libgcj provides gcj and libgcj-javac-placeholder.sh
 %define java_arches %{ix86} alpha ia64 ppc s390 s390x sparc sparcv9 x86_64
-
-%define	__soversion	4.6
-%define	_libdb_a	libdb-%{__soversion}.a
-%define	_libcxx_a	libdb_cxx-%{__soversion}.a
+%define __soversion 4.6
 
 Summary: The Berkeley DB database library (version 4) for C
 Name: db4
 Version: 4.6.21
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 Patch1: http://www.oracle.com/technology/products/berkeley-db/xml/update/4.6.21/patch.4.6.21.1
@@ -21,7 +18,7 @@
 Patch20: db-4.6.18-glibc.patch
 Patch22: db-4.5.20-jni-include-dir.patch
 URL: http://www.oracle.com/database/berkeley-db/
-License: BSD-style
+License: BSD
 Group: System Environment/Libraries
 Obsoletes: db1, db2, db3
 BuildRequires: perl, libtool, ed, tcl-devel >= 8.4.4, util-linux-ng
@@ -83,6 +80,17 @@
 libraries, and documentation for building programs which use the
 Berkeley DB.
 
+%package devel-static
+Summary: Berkeley DB (version 4) static libraries
+Group: Development/Libraries
+
+%description devel-static
+The Berkeley Database (Berkeley DB) is a programmatic toolkit that
+provides embedded database support for both traditional and
+client/server applications. This package contains static libraries
+needed for applications that require statical linking of
+Berkeley DB.
+
 %package tcl
 Summary: Development files for using the Berkeley DB (version 4) with tcl
 Group: Development/Libraries
@@ -275,6 +283,9 @@
 # XXX Avoid Permission denied. strip when building as non-root.
 chmod u+w ${RPM_BUILD_ROOT}%{_bindir}
 
+# remove unneeded .la files (#225675)
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -323,11 +334,7 @@
 %doc	docs/ref docs/images
 %doc	examples_c examples_cxx
 %{_libdir}/libdb.so
-%{_libdir}/libdb-%{__soversion}.la
-%{_libdir}/%{_libdb_a}
 %{_libdir}/libdb_cxx.so
-%{_libdir}/libdb_cxx-%{__soversion}.la
-%{_libdir}/%{_libcxx_a}
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/db.h
 %{_includedir}/%{name}/db_185.h
@@ -336,10 +343,15 @@
 %{_includedir}/db_185.h
 %{_includedir}/db_cxx.h
 
-%files tcl
+%files devel-static
 %defattr(-,root,root)
+%{_libdir}/libdb-%{__soversion}.a
+%{_libdir}/libdb_cxx-%{__soversion}.a
 %{_libdir}/libdb_tcl-%{__soversion}.a
-%{_libdir}/libdb_tcl-%{__soversion}.la
+%{_libdir}/libdb_java-%{__soversion}.a
+
+%files tcl
+%defattr(-,root,root)
 %{_libdir}/libdb_tcl-%{__soversion}.so
 
 %ifarch %{java_arches}
@@ -347,11 +359,15 @@
 %defattr(-,root,root)
 %doc docs/java
 %doc examples_java
-%{_libdir}/libdb_java*
+%{_libdir}/libdb_java*.so
 %{_datadir}/java/*.jar
 %endif
 
 %changelog
+* Sat May 17 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-6
+- fix license, remove .la files (#225675)
+- move static libraries to separate package
+
 * Fri Apr  3 2008 Jindrich Novy <jnovy at redhat.com> 4.6.21-5
 - add upstream patch to fix a race condition between checkpoint
   and DB->close which can result in the checkpoint thread self-deadlocking