SPECS (rpm-4_5): rpm.spec - add nptl bcond for internal db - discard db-rob...

[glen]

Author: glen                         Date: Wed Sep  3 15:39:16 2008 GMT
Module: SPECS                         Tag: rpm-4_5
---- Log message:
- add nptl bcond for internal db
- discard db-robustness patch (not used in db 4.5 either)

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.49.2.18 -> 1.837.2.42.2.49.2.19) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.49.2.18 SPECS/rpm.spec:1.837.2.42.2.49.2.19
--- SPECS/rpm.spec:1.837.2.42.2.49.2.18	Wed Sep  3 16:52:35 2008
+++ SPECS/rpm.spec	Wed Sep  3 17:39:10 2008
@@ -18,9 +18,11 @@
 %if "%{pld_release}" == "ac"
 %bcond_without	autoreqdep	# autogenerate package name deps in addition to sonames/perl(X)
 %bcond_without	internal_db		# internal db (db 4.5.20)
+%bcond_with		nptl			# internal db: don't use process-shared POSIX mutexes (NPTL provides full interface)
 %else
 %bcond_with		autoreqdep	# autogenerate package name deps in addition to sonames/perl(X)
 %bcond_with		internal_db		# internal db (db 4.5.20)
+%bcond_without	nptl			# internal db: don't use process-shared POSIX mutexes (NPTL provides full interface)
 %endif
 %bcond_without	python		# don't build python bindings
 %bcond_without	selinux		# build without selinux support
@@ -144,7 +146,7 @@
 Patch75:	%{name}-rpmte-segv.patch
 Patch76:	%{name}-pydebuginfo.patch
 Patch77:	%{name}-dirdeps-macro.patch
-Patch78:	db-%{name}-robustness.patch
+Patch78:	%{name}-db3-configure.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -750,10 +752,14 @@
 %if %{with internal_db}
 cd db
 %patchset_patch 1 %{reqdb_patch}
-%if "%{reqdb_ver}" == "4.5.20"
-%patch78 -p1
+%if %{without nptl}
+sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
 %endif
+cp -f /usr/share/aclocal/libtool.m4 dist/aclocal/libtool.ac
+cp -f /usr/share/automake/config.sub dist
+cp -f /usr/share/libtool/ltmain.sh dist
 cd -
+%patch78 -p1
 %else
 %patch15 -p1
 rm -rf db3 db
@@ -811,6 +817,7 @@
 	%{?with_python:--with-python=%{py_ver}} \
 	%{!?with_python:--without-python} \
 	%{!?with_selinux:--without-selinux} \
+	--%{?with_nptl:en}%{!?with_nptl:dis}able-posixmutexes \
 	--without-db
 
 %{__make} \
@@ -1393,6 +1400,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.19  2008/09/03 15:39:10  glen
+- add nptl bcond for internal db
+- discard db-robustness patch (not used in db 4.5 either)
+
 Revision 1.837.2.42.2.49.2.18  2008/09/03 14:52:35  glen
 - internal db build fixes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.42.2.49.2.18&r2=1.837.2.42.2.49.2.19&f=u