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

[qboosh]

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

---- Files affected:
packages/db4.6:
   db4.6.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/db4.6/db4.6.spec
diff -u packages/db4.6/db4.6.spec:1.13 packages/db4.6/db4.6.spec:1.14
--- packages/db4.6/db4.6.spec:1.13	Mon Dec 12 21:26:58 2011
+++ packages/db4.6/db4.6.spec	Thu Dec 15 16:56:12 2011
@@ -68,6 +68,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
@@ -101,6 +102,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
@@ -150,6 +152,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
 
@@ -166,6 +169,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
 
@@ -182,6 +186,7 @@
 Requires:	jpackage-utils
 %if %{with default_db}
 Provides:	db-java = %{version}-%{release}
+Obsoletes:	db-java
 %endif
 
 %description java
@@ -197,6 +202,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
 
@@ -229,6 +235,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
 
@@ -592,6 +599,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2011/12/15 15:56:12  qboosh
+- unified: more Obsoletes when built as default_db
+
 Revision 1.13  2011/12/12 20:26:58  qboosh
 - db-utils Obsoletes in default_db case
 
================================================================

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