packages: db4.2/db4.2.spec - unified: more Obsoletes when built as default_db

[qboosh]

Author: qboosh                       Date: Thu Dec 15 17:17:09 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unified: more Obsoletes when built as default_db

---- Files affected:
packages/db4.2:
   db4.2.spec (1.85 -> 1.86) 

---- Diffs:

================================================================
Index: packages/db4.2/db4.2.spec
diff -u packages/db4.2/db4.2.spec:1.85 packages/db4.2/db4.2.spec:1.86
--- packages/db4.2/db4.2.spec:1.85	Tue Dec 13 16:54:21 2011
+++ packages/db4.2/db4.2.spec	Thu Dec 15 18:17:04 2011
@@ -3,7 +3,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
@@ -63,6 +63,7 @@
 Requires:	%{name} = %{version}-%{release}
 %if %{with default_db}
 Provides:	db-devel = %{version}-%{release}
+Obsoletes:	db-devel
 Obsoletes:	db3-devel
 Obsoletes:	db4-devel
 %endif
@@ -96,6 +97,7 @@
 Requires:	%{name}-devel = %{version}-%{release}
 %if %{with default_db}
 Provides:	db-static = %{version}-%{release}
+Obsoletes:	db-static
 Obsoletes:	db3-static
 Obsoletes:	db4-static
 %endif
@@ -145,6 +147,7 @@
 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
 
@@ -161,6 +164,7 @@
 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
 
@@ -177,6 +181,7 @@
 Requires:	jpackage-utils
 %if %{with default_db}
 Provides:	db-java = %{version}-%{release}
+Obsoletes:	db-java
 %endif
 
 %description java
@@ -192,6 +197,7 @@
 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
 
@@ -224,6 +230,7 @@
 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
 
@@ -306,12 +313,12 @@
 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 \
@@ -325,15 +332,14 @@
 ../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}' \
@@ -578,6 +584,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86  2011/12/15 17:17:04  qboosh
+- unified: more Obsoletes when built as default_db
+
 Revision 1.85  2011/12/13 15:54:21  qboosh
 - unified; install versioned db.jar and db-utils (with symlinks if built as default_db)
 
================================================================

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