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

[qboosh]

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

---- Files affected:
packages/db4.5:
   db4.5.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: packages/db4.5/db4.5.spec
diff -u packages/db4.5/db4.5.spec:1.29 packages/db4.5/db4.5.spec:1.30
--- packages/db4.5/db4.5.spec:1.29	Mon Dec 12 21:27:15 2011
+++ packages/db4.5/db4.5.spec	Thu Dec 15 18:04:11 2011
@@ -77,6 +77,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
@@ -110,6 +111,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
@@ -159,6 +161,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
 
@@ -175,6 +178,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
 
@@ -191,6 +195,7 @@
 Requires:	jpackage-utils
 %if %{with default_db}
 Provides:	db-java = %{version}-%{release}
+Obsoletes:	db-java
 %endif
 
 %description java
@@ -206,6 +211,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
 
@@ -238,6 +244,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
 
@@ -610,6 +617,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2011/12/15 17:04:11  qboosh
+- unified: more Obsoletes when built as default_db
+
 Revision 1.29  2011/12/12 20:27:15  qboosh
 - db-utils Obsoletes in default_db case
 
================================================================

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