SPECS: X11-driver-nvidia-legacy.spec - add O: i C:

[wolvverine]

Author: wolvverine                   Date: Sun Sep 11 17:35:31 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add O: i C:

---- Files affected:
SPECS:
   X11-driver-nvidia-legacy.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.4 SPECS/X11-driver-nvidia-legacy.spec:1.5
--- SPECS/X11-driver-nvidia-legacy.spec:1.4	Sun Sep 11 19:13:39 2005
+++ SPECS/X11-driver-nvidia-legacy.spec	Sun Sep 11 19:35:26 2005
@@ -13,6 +13,8 @@
 %define		_rel		3
 #####################################
 #
+%define		oldname 	X11-driver-nvidia
+
 Summary:	Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
 Summary(pl):	Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
 Name:		X11-driver-nvidia-legacy
@@ -54,6 +56,8 @@
 Obsoletes:	XFree86-OpenGL-libGL
 Obsoletes:	XFree86-driver-nvidia
 Obsoletes:	XFree86-nvidia
+Obsoletes:	%{oldname}
+Conflicts:	%{oldname}
 Conflicts:	XFree86-OpenGL-devel <= 4.2.0-3
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -92,6 +96,8 @@
 Provides:	OpenGL-devel-base
 Obsoletes:	OpenGL-devel-base
 Obsoletes:	XFree86-driver-nvidia-devel
+Obsoletes:	%{oldname}-devel
+Conflicts:	%{oldname}-devel
 Conflicts:	XFree86-OpenGL-devel < 4.3.99.902-0.3
 
 %description devel
@@ -106,6 +112,8 @@
 Summary(pl):	Narzędzia do zarządzania kartami graficznymi nVidia
 Group:		Applications/System
 Obsoletes:	XFree86-driver-nvidia-progs
+Obsoletes:	%{oldname}-progs
+Conflicts:	%{oldname}-progs
 Requires:	%{name} = %{version}-%{release}
 
 %description progs
@@ -126,6 +134,8 @@
 %{?with_dist_kernel:%requires_releq_kernel_up}
 Provides:	X11-driver-nvidia(kernel)
 Obsoletes:	XFree86-nvidia-kernel
+Obsoletes:	kernel-video-nvidia
+Conflicts:	kernel-video-nvidia	
 
 %description -n kernel-video-nvidia-legacy
 nVidia Architecture support for Linux kernel.
@@ -148,6 +158,8 @@
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 Provides:	X11-driver-nvidia(kernel)
 Obsoletes:	XFree86-nvidia-kernel
+Obsoletes:	kernel-smp-video-nvidia
+Conflicts:	kernel-smp-video-nvidia	
 
 %description -n kernel-smp-video-nvidia-legacy
 nVidia Architecture support for Linux kernel SMP.
@@ -335,6 +347,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/09/11 17:35:26  wolvverine
+- add O: i C:
+
 Revision 1.4  2005/09/11 17:13:39  wolvverine
 - more
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11-driver-nvidia-legacy.spec?r1=1.4&r2=1.5&f=u