SPECS: db4.3.spec - updated to 4.3.28 - merged nptl bcond fix from...

[qboosh]

Author: qboosh                       Date: Sat Jul 16 16:45:22 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 4.3.28
- merged nptl bcond fix from db4.2
- move libdb to /%{_lib} as it's used by /bin/rpm on HEAD

---- Files affected:
SPECS:
   db4.3.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/db4.3.spec
diff -u SPECS/db4.3.spec:1.10 SPECS/db4.3.spec:1.11
--- SPECS/db4.3.spec:1.10	Fri Jun 17 22:24:47 2005
+++ SPECS/db4.3.spec	Sat Jul 16 18:45:17 2005
@@ -4,22 +4,22 @@
 %bcond_with	java	# build db-java (required for openoffice)
 %bcond_without	tcl	# don't build Tcl bindings
 %bcond_with	pmutex	# use POSIX mutexes (only process-private with linuxthreads)
-%bcond_with	nptl	# synonym for pmutex (NPTL provides full interface)
+%bcond_with	nptl	# use process-shared POSIX mutexes (NPTL provides full interface)
 %bcond_without	static_libs	# don't build static libraries
 #
 %{?with_nptl:%define	with_pmutex	1}
 Summary:	Berkeley DB database library for C
 Summary(pl):	Biblioteka C do obsługi baz Berkeley DB
 Name:		db4.3
-Version:	4.3.27
-Release:	2
+Version:	4.3.28
+Release:	1
 Epoch:		0
 License:	Sleepycat public license (GPL-like, see LICENSE)
 Group:		Libraries
 # alternative site (sometimes working): http://www.berkeleydb.com/
 #Source0Download: http://www.sleepycat.com/download/db/
 Source0:	ftp://ftp.sleepycat.com/releases/db-%{version}.tar.gz
-# Source0-md5:	fcc481d52c3b80e20a328f8c0cb042bd
+# Source0-md5:	e27759537db6054b31d8cb3e99ba6fbb
 URL:		http://www.sleepycat.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -237,11 +237,15 @@
 %prep
 %setup -q -n db-%{version}
 
+%if %{without nptl}
+sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
+%endif
+
 %build
 cd dist
-cp -f %{_datadir}/aclocal/libtool.m4 aclocal/libtool.ac
-cp -f %{_datadir}/automake/config.sub .
-cp -f %{_datadir}/libtool/ltmain.sh .
+cp -f /usr/share/aclocal/libtool.m4 aclocal/libtool.ac
+cp -f /usr/share/automake/config.sub .
+cp -f /usr/share/libtool/ltmain.sh .
 sh s_config
 cd ..
 
@@ -293,7 +297,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir}}
+install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir},%{_bindir},/%{_lib}}
 %if %{with java}
 install -d $RPM_BUILD_ROOT%{_javadir}
 %endif
@@ -307,17 +311,19 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	LIB_INSTALL_FILE_LIST=""
 
+mv $RPM_BUILD_ROOT%{_libdir}/libdb-4.3.so $RPM_BUILD_ROOT/%{_lib}
+
 cd $RPM_BUILD_ROOT%{_libdir}
-ln -sf libdb-4.3.so libdb.so
-ln -sf libdb-4.3.so libdb4.so
-ln -sf libdb-4.3.so libdb-4.so
-ln -sf libdb-4.3.so libndbm.so
+ln -sf /%{_lib}/libdb-4.3.so libdb.so
+ln -sf /%{_lib}/libdb-4.3.so libdb4.so
+ln -sf /%{_lib}/libdb-4.3.so libdb-4.so
+ln -sf /%{_lib}/libdb-4.3.so libndbm.so
 ln -sf libdb-4.3.la libdb.la
 ln -sf libdb-4.3.la libdb4.la
 ln -sf libdb-4.3.la libndbm.la
 %if %{with java}
 ln -sf libdb_java-4.3.la libdb_java.la
-mv -f *.jar $RPM_BUILD_ROOT%{_javadir}
+mv -f $RPM_BUILD_ROOT%{_libdir}/*.jar $RPM_BUILD_ROOT%{_javadir}
 %endif
 %if %{with tcl}
 ln -sf libdb_tcl-4.3.so libdb_tcl.so
@@ -366,7 +372,7 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE README
-%attr(755,root,root) %{_libdir}/libdb-4.3.so
+%attr(755,root,root) /%{_lib}/libdb-4.3.so
 %dir %{_docdir}/db-%{version}-docs
 %{_docdir}/db-%{version}-docs/sleepycat
 %{_docdir}/db-%{version}-docs/index.html
@@ -384,6 +390,8 @@
 %{_includedir}/db.h
 %{_includedir}/db_185.h
 %{_docdir}/db-%{version}-docs/api_c
+%dir %{_docdir}/db-%{version}-docs/gsg
+%{_docdir}/db-%{version}-docs/gsg/C
 %{_docdir}/db-%{version}-docs/images
 %{_docdir}/db-%{version}-docs/ref
 %{_examplesdir}/db-%{version}
@@ -409,6 +417,7 @@
 %{_libdir}/libdb_cxx.la
 %{_libdir}/libdb_cxx.so
 %{_docdir}/db-%{version}-docs/api_cxx
+%{_docdir}/db-%{version}-docs/gsg/CXX
 %{_examplesdir}/db-cxx-%{version}
 
 %if %{with static_libs}
@@ -429,6 +438,8 @@
 %{_libdir}/libdb_java-4.3.la
 %{_libdir}/libdb_java.la
 %{_libdir}/libdb_java.so
+%{_docdir}/db-%{version}-docs/collections
+%{_docdir}/db-%{version}-docs/gsg/JAVA
 %{_docdir}/db-%{version}-docs/java
 %{_examplesdir}/db-java-%{version}
 %endif
@@ -468,6 +479,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/07/16 16:45:17  qboosh
+- updated to 4.3.28
+- merged nptl bcond fix from db4.2
+- move libdb to /%{_lib} as it's used by /bin/rpm on HEAD
+
 Revision 1.10  2005/06/17 20:24:47  twittner
 - added bcond_without static_libs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/db4.3.spec?r1=1.10&r2=1.11&f=u