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

[qboosh]

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

---- Files affected:
packages/db4.4:
   db4.4.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/db4.4/db4.4.spec
diff -u packages/db4.4/db4.4.spec:1.14 packages/db4.4/db4.4.spec:1.15
--- packages/db4.4/db4.4.spec:1.14	Tue Dec 13 14:53:45 2011
+++ packages/db4.4/db4.4.spec	Thu Dec 15 18:05:27 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_without	nptl		# don't 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
@@ -61,6 +61,7 @@
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:	db-devel = %{version}-%{release}
+Obsoletes:	db-devel
 Obsoletes:	db3-devel
 Obsoletes:	db4-devel
 %endif
@@ -94,6 +95,7 @@
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:	db-static = %{version}-%{release}
+Obsoletes:	db-static
 Obsoletes:	db3-static
 Obsoletes:	db4-static
 %endif
@@ -143,6 +145,7 @@
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:	db-cxx-devel = %{version}-%{release}
+Obsoletes:	db-cxx-devel
 %endif
 Conflicts:	db-devel < 4.1.25-3
 
@@ -159,6 +162,7 @@
 Requires:	%{name}-cxx-devel = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:	db-cxx-static = %{version}-%{release}
+Obsoletes:	db-cxx-static
 %endif
 Conflicts:	db-static < 4.2.50-1
 
@@ -175,6 +179,7 @@
 Requires:	jpackage-utils
 %if %{with default_db}
 Provides:	db-java = %{version}-%{release}
+Obsoletes:	db-java
 %endif
 
 %description java
@@ -190,6 +195,7 @@
 Requires:	%{name}-java = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:	db-java-devel = %{version}-%{release}
+Obsoletes:	db-java-devel
 %endif
 Conflicts:	db-devel < 4.1.25-3
 
@@ -222,6 +228,7 @@
 Requires:	%{name}-tcl = %{epoch}:%{version}-%{release}
 %if %{with default_db}
 Provides:	db-tcl-devel = %{version}-%{release}
+Obsoletes:	db-tcl-devel
 %endif
 Conflicts:	db-devel < 4.1.25-3
 
@@ -584,6 +591,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2011/12/15 17:05:27  qboosh
+- unified: more Obsoletes when built as default_db
+
 Revision 1.14  2011/12/13 13:53:45  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.4/db4.4.spec?r1=1.14&r2=1.15&f=u