packages: db4.8/db4.8.spec - use Obsoletes by virtual db-* packages (i.e. t...

[qboosh]

Author: qboosh                       Date: Sun Oct 25 07:53:55 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use Obsoletes by virtual db-* packages (i.e. the "primary" db version)

---- Files affected:
packages/db4.8:
   db4.8.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/db4.8/db4.8.spec
diff -u packages/db4.8/db4.8.spec:1.1 packages/db4.8/db4.8.spec:1.2
--- packages/db4.8/db4.8.spec:1.1	Sun Sep 20 15:06:47 2009
+++ packages/db4.8/db4.8.spec	Sun Oct 25 08:53:49 2009
@@ -64,10 +64,9 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	db-devel = %{version}-%{release}
+Obsoletes:	db-devel
 Obsoletes:	db3-devel
 Obsoletes:	db4-devel
-Obsoletes:	db4.5-devel
-Obsoletes:	db4.6-devel
 
 %description devel
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -97,10 +96,9 @@
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 Provides:	db-static = %{version}-%{release}
+Obsoletes:	db-static
 Obsoletes:	db3-static
 Obsoletes:	db4-static
-Obsoletes:	db4.5-static
-Obsoletes:	db4.6-static
 
 %description static
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -144,6 +142,7 @@
 Requires:	%{name}-cxx = %{epoch}:%{version}-%{release}
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 Provides:	db-cxx-devel = %{version}-%{release}
+Obsoletes:	db-cxx-devel
 Conflicts:	db-devel < 4.1.25-3
 
 %description cxx-devel
@@ -158,6 +157,7 @@
 Group:		Development/Libraries
 Requires:	%{name}-cxx-devel = %{epoch}:%{version}-%{release}
 Provides:	db-cxx-static = %{version}-%{release}
+Obsoletes:	db-cxx-static
 Conflicts:	db-static < 4.2.50-1
 
 %description cxx-static
@@ -172,6 +172,8 @@
 Group:		Libraries
 Requires:	jpackage-utils
 Provides:	db-java = %{version}-%{release}
+# db.jar conflicts
+Obsoletes:	db-java
 
 %description java
 Berkeley database library for Java.
@@ -185,6 +187,7 @@
 Group:		Development/Languages/Java
 Requires:	%{name}-java = %{epoch}:%{version}-%{release}
 Provides:	db-java-devel = %{version}-%{release}
+Obsoletes:	db-java-devel
 Conflicts:	db-devel < 4.1.25-3
 
 %description java-devel
@@ -213,6 +216,7 @@
 Group:		Development/Languages/Tcl
 Requires:	%{name}-tcl = %{epoch}:%{version}-%{release}
 Provides:	db-tcl-devel = %{version}-%{release}
+Obsoletes:	db-tcl-devel
 Conflicts:	db-devel < 4.1.25-3
 
 %description tcl-devel
@@ -227,6 +231,7 @@
 Group:		Applications/Databases
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	db-utils = %{version}-%{release}
+Obsoletes:	db-utils
 Obsoletes:	db3-utils
 Obsoletes:	db4-utils
 
@@ -508,7 +513,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2009/10/25 07:53:49  qboosh
+- use Obsoletes by virtual db-* packages (i.e. the "primary" db version)
+
 Revision 1.1  2009/09/20 13:06:47  arekm
 - initial; 4.8.24
-
-Revision 1.23  2009/08/19 06:50:52  arekm
================================================================

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