rpms/db4/devel db4.spec,1.46,1.47

Tue Jul 31 14:07:02 UTC 2007

Author: jnovy

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

Modified Files:
	db4.spec 
Log Message:
- remove nptl-abi-note.S, useless as we are definitely
  running kernel >= 2.4.20 (#245416)
- move C++ stuff to subpackages to reduce dependency bloat (#220484)



Index: db4.spec
===================================================================
RCS file: /cvs/extras/rpms/db4/devel/db4.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47

--- db4.spec	31 Jul 2007 08:21:33 -0000	1.46
+++ db4.spec	31 Jul 2007 14:06:30 -0000	1.47
@@ -11,7 +11,6 @@
 Release: 1%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
-Source2: nptl-abi-note.S
 Patch2: db-4.3.29-sparc64.patch
 Patch10: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.1
 Patch11: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/patch.1.2
@@ -41,6 +40,20 @@
 used by many applications, including Python and Perl, so this should
 be installed on all systems.
 
+%package cxx
+Summary: The Berkeley DB database library (version 4) for C++
+Group: System Environment/Libraries
+
+%description cxx
+The Berkeley Database (Berkeley DB) is a programmatic toolkit that
+provides embedded database support for both traditional and
+client/server applications. The Berkeley DB includes B+tree, Extended
+Linear Hashing, Fixed and Variable-length record access methods,
+transactions, locking, logging, shared memory caching, and database
+recovery. The Berkeley DB supports C, C++, Java, and Perl APIs. It is
+used by many applications, including Python and Perl, so this should
+be installed on all systems.
+
 %package utils
 Summary: Command line tools for managing Berkeley DB (version 4) databases
 Group: Applications/Databases
@@ -55,11 +68,8 @@
 transactions, locking, logging, shared memory caching, and database
 recovery. DB supports C, C++, Java and Perl APIs.
 
-This package contains command line tools for managing Berkeley DB
-(version 4) databases.
-
 %package devel
-Summary: Development files for the Berkeley DB (version 4) library
+Summary: C development files for the Berkeley DB (version 4) library
 Group: Development/Libraries
 Requires: db4 = %{version}-%{release}
 Obsoletes: db1-devel, db2-devel, db3-devel
@@ -69,7 +79,19 @@
 provides embedded database support for both traditional and
 client/server applications. This package contains the header files,
 libraries, and documentation for building programs which use the
-Berkeley DB.
+Berkeley DB via C language API.
+
+%package cxx-devel
+Summary: C++ development files for the Berkeley DB (version 4) library
+Group: Development/Libraries
+Requires: db4-cxx = %{version}-%{release}, db4-devel = %{version}-%{release}
+
+%description cxx-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 the header files,
+libraries, and documentation for building programs which use the
+Berkeley DB via C++ language API.
 
 %package tcl
 Summary: Development files for using the Berkeley DB (version 4) with tcl
@@ -164,14 +186,8 @@
 	# Static link db_dump185 with old db-185 libraries.
 	/bin/sh libtool --mode=compile %{__cc} $RPM_OPT_FLAGS -Idb.1.85/PORT/%{_os}/include -D_REENTRANT -c db_dump185/db_dump185.c -o dist/$1/db_dump185.lo
 	/bin/sh libtool --mode=link    %{__cc} -o dist/$1/db_dump185 dist/$1/db_dump185.lo db.1.85/PORT/%{_os}/libdb.a
+
 	pushd dist/$1
-	# Force the threading model used, for selecting whether or not we will
-	# depend on NPTL-specific features.
-	echo ${2:+db_cv_mutex=$2} > config.cache
-	if test -n "$nptl_lo" ; then
-		/bin/sh libtool --mode=compile %{__cc} $RPM_OPT_FLAGS \
-			-o $nptl_lo -c $nptl_s
-	fi
 	ln -sf ../configure .
 	# XXX --enable-diagnostic should be disabled for production (but is
 	# useful).
@@ -198,12 +214,7 @@
 	perl -pi -e 's/^postdep_objects=".*$/postdep_objects=""/' libtool
 	perl -pi -e 's/-shared -nostdlib/-shared/' libtool
 
-#	make libdb=%{_libdb_a} libcxx=%{_libcxx_a} %{?_smp_mflags} \
-	make                                       %{?_smp_mflags} \
-		 LIBSO_LIBS='$(LIBS)'" $nptl_lo" \
-		LIBXSO_LIBS='$(LIBS)'" $nptl_lo" \
-		LIBJSO_LIBS='$(LIBS)'" $nptl_lo" \
-		LIBTSO_LIBS='$(LIBS)'" $nptl_lo"
+	make    %{?_smp_mflags}
 
 	# XXX hack around libtool not creating ./libs/libdb_java-X.Y.lai
 	LDBJ=./.libs/libdb_java-%{__soversion}.la
@@ -214,15 +225,7 @@
 	popd
 }
 
-unset nptl_s nptl_lo
-case %{_os} in
-linux|Linux)
-	nptl_s=%{SOURCE2}
-	nptl_lo=nptl-abi-note.lo
-	;;
-esac
-build dist-tls POSIX/pthreads/library
-unset nptl_s nptl_lo
+build dist-tls
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -300,6 +303,9 @@
 %doc LICENSE README
 /%{_lib}/libdb-%{__soversion}.so
 %{_libdir}/libdb-%{__soversion}.so
+
+%files cxx
+%defattr(-,root,root)
 %{_libdir}/libdb_cxx-%{__soversion}.so
 
 %files utils
@@ -321,17 +327,26 @@
 
 %files devel
 %defattr(-,root,root)
-%doc	docs/api_c docs/api_cxx docs/api_tcl docs/index.html
+%doc	docs/api_c docs/api_tcl docs/index.html
 %doc	docs/ref docs/images
-%doc	examples_c examples_cxx
+%doc	examples_c
 %{_libdir}/libdb.so
-%{_libdir}/libdb_cxx.so
 %{_libdir}/libdb-%{__soversion}.la
-%{_libdir}/libdb_cxx-%{__soversion}.la
 %{_libdir}/%{_libdb_a}
+%{_includedir}/%{name}/db.h
+%{_includedir}/%{name}/db_185.h
+%{_includedir}/db.h
+%{_includedir}/db_185.h
+
+%files cxx-devel
+%defattr(-,root,root)
+%doc	docs/api_cxx
+%doc	examples_cxx
+%{_libdir}/libdb_cxx.so
+%{_libdir}/libdb_cxx-%{__soversion}.la
 %{_libdir}/%{_libcxx_a}
-%{_includedir}/%{name}
-%{_includedir}/*.h
+%{_includedir}/%{name}/db_cxx.h
+%{_includedir}/db_cxx.h
 
 %files tcl
 %defattr(-,root,root)
@@ -352,6 +367,9 @@
 * Mon Jul 30 2007 Jindrich Novy <jnovy at redhat.com> 4.6.18-1
 - update to 4.6.18
 - drop upstream patches for 4.5.20 and gcj patch
+- remove nptl-abi-note.S, useless as we are definitely
+  running kernel >= 2.4.20 (#245416)
+- move C++ stuff to subpackages to reduce dependency bloat (#220484)
 - package db_codegen
 
 * Sat Mar 24 2007 Thomas Fitzsimmons <fitzsim at redhat.com> 4.5.20-5


