From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 15 Dec 2011 17:17:04 +0000 (+0000)
Subject: - unified: more Obsoletes when built as default_db
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdb4.2.git;a=commitdiff_plain;h=HEAD

- unified: more Obsoletes when built as default_db

Changed files:
    db4.2.spec -> 1.86
---

diff --git a/db4.2.spec b/db4.2.spec
index f6bfd4b..d36852b 100644
--- a/db4.2.spec
+++ b/db4.2.spec
@@ -2,7 +2,7 @@
 # Conditional build:
 %bcond_without	java		# don't build Java library
 %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_with	nptl		# use process-shared POSIX mutexes (NPTL provides full interface)
 %bcond_without	static_libs	# don't build static libraries
 %bcond_with	default_db	# use this db as default system db
@@ -62,6 +62,7 @@ Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 %if %{with default_db}
 Provides:	db-devel = %{version}-%{release}
+Obsoletes:	db-devel
 Obsoletes:	db3-devel
 Obsoletes:	db4-devel
 %endif
@@ -95,6 +96,7 @@ Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 %if %{with default_db}
 Provides:	db-static = %{version}-%{release}
+Obsoletes:	db-static
 Obsoletes:	db3-static
 Obsoletes:	db4-static
 %endif
@@ -144,6 +146,7 @@ Requires:	%{name}-cxx = %{version}-%{release}
 Requires:	%{name}-devel = %{version}-%{release}
 %if %{with default_db}
 Provides:	db-cxx-devel = %{version}-%{release}
+Obsoletes:	db-cxx-devel
 %endif
 Conflicts:	db-devel < 4.1.25-3
 
@@ -160,6 +163,7 @@ Group:		Development/Libraries
 Requires:	%{name}-cxx-devel = %{version}-%{release}
 %if %{with default_db}
 Provides:	db-cxx-static = %{version}-%{release}
+Obsoletes:	db-cxx-static
 %endif
 Conflicts:	db-static < 4.2.50-1
 
@@ -176,6 +180,7 @@ Group:		Libraries
 Requires:	jpackage-utils
 %if %{with default_db}
 Provides:	db-java = %{version}-%{release}
+Obsoletes:	db-java
 %endif
 
 %description java
@@ -191,6 +196,7 @@ Group:		Development/Languages/Java
 Requires:	%{name}-java = %{version}-%{release}
 %if %{with default_db}
 Provides:	db-java-devel = %{version}-%{release}
+Obsoletes:	db-java-devel
 %endif
 Conflicts:	db-devel < 4.1.25-3
 
@@ -223,6 +229,7 @@ Group:		Development/Languages/Tcl
 Requires:	%{name}-tcl = %{version}-%{release}
 %if %{with default_db}
 Provides:	db-tcl-devel = %{version}-%{release}
+Obsoletes:	db-tcl-devel
 %endif
 Conflicts:	db-devel < 4.1.25-3
 
@@ -305,12 +312,12 @@ LDFLAGS="%{rpmcflags} %{rpmldflags}"
 export CC CXX CFLAGS CXXFLAGS LDFLAGS
 
 ../dist/%configure \
-	--enable-compat185 \
 	--disable-shared \
 	--enable-static \
-	--enable-rpc \
+	--enable-compat185 \
+	--enable-cxx \
 	--%{?with_pmutex:en}%{!?with_pmutex:dis}able-posixmutexes \
-	--enable-cxx
+	--enable-rpc
 
 # (temporarily?) disabled because of compilation errors:
 #	--enable-dump185 \
@@ -324,15 +331,14 @@ cd build_unix
 ../dist/%configure \
 	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
+	--enable-shared \
+	--disable-static \
 	--enable-compat185 \
-	--enable-rpc \
-	--%{?with_pmutex:en}%{!?with_pmutex:dis}able-posixmutexes \
 	--enable-cxx \
-	%{?with_tcl:--enable-tcl} \
-	%{?with_tcl:--with-tcl=/usr/lib} \
+	--%{?with_pmutex:en}%{!?with_pmutex:dis}able-posixmutexes \
+	--enable-rpc \
 	%{?with_java:--enable-java} \
-	--disable-static \
-	--enable-shared
+	%{?with_tcl:--enable-tcl --with-tcl=/usr/lib}
 
 %{__make} library_build \
 	TCFLAGS='-I$(builddir) -I%{_includedir}' \