packages: db4.5/db4.5.spec - updated URLs - adjusted for libtool 2.x

[qboosh]

Author: qboosh                       Date: Sun Dec 11 07:30:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated URLs
- adjusted for libtool 2.x

---- Files affected:
packages/db4.5:
   db4.5.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: packages/db4.5/db4.5.spec
diff -u packages/db4.5/db4.5.spec:1.24 packages/db4.5/db4.5.spec:1.25
--- packages/db4.5/db4.5.spec:1.24	Wed Sep  3 17:16:16 2008
+++ packages/db4.5/db4.5.spec	Sun Dec 11 08:30:49 2011
@@ -2,25 +2,26 @@
 #
 # Conditional build:
 %if "%{pld_release}" == "ac"
-%bcond_with		java	# build db-java
-%bcond_with		nptl	# don't use process-shared POSIX mutexes (NPTL provides full interface)
+%bcond_with	java		# build Java library
+%bcond_with	nptl		# use process-shared POSIX mutexes (NPTL provides full interface)
 %else
-%bcond_without	java		# don't build java bindings
+%bcond_without	java		# don't build Java library
 %bcond_without	nptl		# don't use process-shared POSIX mutexes (NPTL provides full interface)
 %endif
 %bcond_without	tcl		# don't build Tcl bindings
-%bcond_with	pmutex		# use POSIX mutexes (only process-private with linuxthreads)
+%bcond_with	pmutex		# use process-shared POSIX mutexes (not available with linuxthreads)
 %bcond_without	static_libs	# don't build static libraries
-%bcond_with	rpm_robustness
+%bcond_with	default_db	# use this db as default system db
+%bcond_with	rpm_robustness	# apply rpm-robustness patch (use robust mutexes)
 #
+%define		mver		4.5
+%define		ver		%{mver}.20
+%define		patchlevel	2
 %{?with_nptl:%define	with_pmutex	1}
 %ifnarch i586 i686 athlon pentium3 pentium4 %{x8664}
 %undefine with_java
 %endif
 
-%define		mver		4.5
-%define		ver			%{mver}.20
-%define		patchlevel	2
 Summary:	Berkeley DB database library for C
 Summary(pl.UTF-8):	Biblioteka C do obsługi baz Berkeley DB
 Name:		db4.5
@@ -29,11 +30,12 @@
 Epoch:		0
 License:	Sleepycat public license (GPL-like, see LICENSE)
 Group:		Libraries
+#Source0Download: http://www.oracle.com/technetwork/database/berkeleydb/downloads/index-082944.html
 Source0:	http://download.oracle.com/berkeley-db/db-%{ver}.tar.gz
 # Source0-md5:	b0f1c777708cb8e9d37fb47e7ed3312d
-%patchset_source -f http://www.oracle.com/technology/products/berkeley-db/db/update/%{ver}/patch.%{ver}.%g 1 %{patchlevel}
+%patchset_source -f http://download.oracle.com/berkeley-db/patches/db/%{ver}/patch.%{ver}.%g 1 %{patchlevel}
 Patch0:		db-rpm-robustness.patch
-URL:		http://www.oracle.com/technology/software/products/berkeley-db/db/index.html
+URL:		http://www.oracle.com/technetwork/database/berkeleydb/downloads/index.html
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	ed
@@ -254,7 +256,6 @@
 
 %prep
 %setup -q -n db-%{ver}
-
 # official patches
 %patchset_patch 1 %{patchlevel}
 
@@ -264,11 +265,17 @@
 sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
 %endif
 
+sed -i -e '/AC_PROG_LIBTOOL/aLT_OUTPUT' dist/configure.ac
+
 %build
 cd dist
 cp -f /usr/share/aclocal/libtool.m4 aclocal/libtool.ac
+cp -f /usr/share/aclocal/ltoptions.m4 aclocal/ltoptions.ac
+cp -f /usr/share/aclocal/ltsugar.m4 aclocal/ltsugar.ac
+cp -f /usr/share/aclocal/ltversion.m4 aclocal/ltversion.ac
+cp -f /usr/share/aclocal/lt~obsolete.m4 aclocal/lt~obsolete.ac
 cp -f /usr/share/automake/config.sub .
-cp -f /usr/share/libtool/ltmain.sh .
+cp -f /usr/share/libtool/config/ltmain.sh .
 sh s_config
 cd ..
 
@@ -328,14 +335,14 @@
 
 %if %{with static_libs}
 %{__make} -C build_unix.static library_install \
-	docdir=%{_docdir}/db-%{version}-docs \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	docdir=%{_docdir}/db-%{version}-docs
 %endif
 
 %{__make} -C build_unix library_install \
-	docdir=%{_docdir}/db-%{version}-docs \
 	DESTDIR=$RPM_BUILD_ROOT \
-	LIB_INSTALL_FILE_LIST=""
+	LIB_INSTALL_FILE_LIST="" \
+	docdir=%{_docdir}/db-%{version}-docs
 
 mv $RPM_BUILD_ROOT%{_libdir}/libdb-%{mver}.so $RPM_BUILD_ROOT/%{_lib}
 
@@ -381,11 +388,11 @@
 install -d $RPM_BUILD_ROOT%{_examplesdir}/db-java-%{version}
 cp -rf examples_java/* $RPM_BUILD_ROOT%{_examplesdir}/db-java-%{version}
 %else
-rm -rf $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/java
-rm -rf $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/collections
-rm -rf $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/gsg/JAVA
-rm -rf $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/gsg_txn/JAVA
-rm -rf $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/gsg_db_rep/JAVA
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/java
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/collections
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/gsg/JAVA
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/gsg_txn/JAVA
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/db-%{version}-docs/gsg_db_rep/JAVA
 %endif
 
 %clean
@@ -406,6 +413,7 @@
 %attr(755,root,root) /%{_lib}/libdb-%{mver}.so
 %dir %{_docdir}/db-%{version}-docs
 %{_docdir}/db-%{version}-docs/index.html
+%{_docdir}/db-%{version}-docs/license
 
 %files devel
 %defattr(644,root,root,755)
@@ -517,6 +525,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2011/12/11 07:30:49  qboosh
+- updated URLs
+- adjusted for libtool 2.x
+
 Revision 1.24  2008/09/03 15:16:16  glen
 - if nptl/pmutex enabled, require 2.6 kernel (broken for 2.4 kernel)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/db4.5/db4.5.spec?r1=1.24&r2=1.25&f=u