SPECS: xorg-driver-video-fglrx.spec, xorg-driver-video-nvidia-lega...

[patrys]

Author: patrys                       Date: Fri Nov  9 18:17:06 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't obsolete mesa-libgl

---- Files affected:
SPECS:
   xorg-driver-video-fglrx.spec (1.58 -> 1.59) , xorg-driver-video-nvidia-legacy2.spec (1.24 -> 1.25) , xorg-driver-video-nvidia-legacy.spec (1.45 -> 1.46) , xorg-driver-video-nvidia.spec (1.125 -> 1.126) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-fglrx.spec
diff -u SPECS/xorg-driver-video-fglrx.spec:1.58 SPECS/xorg-driver-video-fglrx.spec:1.59
--- SPECS/xorg-driver-video-fglrx.spec:1.58	Thu Oct 25 16:00:07 2007
+++ SPECS/xorg-driver-video-fglrx.spec	Fri Nov  9 19:17:01 2007
@@ -25,7 +25,7 @@
 Summary(pl.UTF-8):	Sterowniki do akceleratorów graficznych ATI
 Name:		xorg-driver-video-fglrx
 Version:	8.42.3
-%define		_rel	2
+%define		_rel	3
 Release:	%{_rel}%{?with_multigl:.mgl}
 License:	ATI Binary (parts are GPL)
 Group:		X11
@@ -56,7 +56,7 @@
 %endif
 %if !%{with multigl}
 Obsoletes:	Mesa
-Obsoletes:	Mesa-libGL
+Conflicts:	Mesa-libGL
 %endif
 Obsoletes:	X11-OpenGL-libGL < 1:7.0.0
 Obsoletes:	X11-driver-firegl < 1:7.0.0
@@ -277,6 +277,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2007-11-09 18:17:01  patrys
+- don't obsolete mesa-libgl
+
 Revision 1.58  2007-10-25 14:00:07  blues
 - rel.2
 

================================================================
Index: SPECS/xorg-driver-video-nvidia-legacy2.spec
diff -u SPECS/xorg-driver-video-nvidia-legacy2.spec:1.24 SPECS/xorg-driver-video-nvidia-legacy2.spec:1.25
--- SPECS/xorg-driver-video-nvidia-legacy2.spec:1.24	Thu Nov  1 08:41:18 2007
+++ SPECS/xorg-driver-video-nvidia-legacy2.spec	Fri Nov  9 19:17:01 2007
@@ -12,7 +12,7 @@
 %define		_nv_ver		96
 %define		_nv_rel		43.01
 %define		_min_x11	6.7.0
-%define		_rel		3
+%define		_rel		4
 #
 %define		need_x86	0
 %define		need_x8664	0
@@ -58,13 +58,13 @@
 Provides:	OpenGL-GLX = 1.4
 Provides:	xorg-xserver-libglx
 Obsoletes:	Mesa
-Obsoletes:	Mesa-libGL
 Obsoletes:	X11-OpenGL-core < 1:7.0.0
 Obsoletes:	X11-OpenGL-libGL < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-core < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-libGL < 1:7.0.0
 Obsoletes:	XFree86-driver-nvidia
 Obsoletes:	XFree86-nvidia
+Conflicts:	Mesa-libGL
 Conflicts:	XFree86-OpenGL-devel <= 4.2.0-3
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -323,6 +323,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2007-11-09 18:17:01  patrys
+- don't obsolete mesa-libgl
+
 Revision 1.24  2007-11-01 07:41:18  shadzik
 - rel 3 (rebuild with 2.6.22.10-4)
 

================================================================
Index: SPECS/xorg-driver-video-nvidia-legacy.spec
diff -u SPECS/xorg-driver-video-nvidia-legacy.spec:1.45 SPECS/xorg-driver-video-nvidia-legacy.spec:1.46
--- SPECS/xorg-driver-video-nvidia-legacy.spec:1.45	Thu Nov  1 08:40:03 2007
+++ SPECS/xorg-driver-video-nvidia-legacy.spec	Fri Nov  9 19:17:01 2007
@@ -7,7 +7,7 @@
 %bcond_with	verbose		# verbose build (V=1)
 #
 %define		_min_x11	6.7.0
-%define		_rel		1
+%define		_rel		2
 #
 Summary:	Linux Drivers for old nVidia TNT/TNT2/GeForce/Quadro Chips
 Summary(pl.UTF-8):	Sterowniki do starych kart graficznych nVidia TNT/TNT2/GeForce/Quadro
@@ -38,13 +38,13 @@
 Provides:	OpenGL-GLX = 1.3
 Provides:	xorg-xserver-libglx
 Obsoletes:	Mesa
-Obsoletes:	Mesa-libGL
 Obsoletes:	X11-OpenGL-core < 1:7.0.0
 Obsoletes:	X11-OpenGL-libGL < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-core < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-libGL < 1:7.0.0
 Obsoletes:	XFree86-driver-nvidia
 Obsoletes:	XFree86-nvidia
+Conflicts:	Mesa-libGL
 Conflicts:	XFree86-OpenGL-devel <= 4.2.0-3
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -272,6 +272,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2007-11-09 18:17:01  patrys
+- don't obsolete mesa-libgl
+
 Revision 1.45  2007-11-01 07:40:03  shadzik
 - rel 1
 

================================================================
Index: SPECS/xorg-driver-video-nvidia.spec
diff -u SPECS/xorg-driver-video-nvidia.spec:1.125 SPECS/xorg-driver-video-nvidia.spec:1.126
--- SPECS/xorg-driver-video-nvidia.spec:1.125	Thu Nov  1 08:37:51 2007
+++ SPECS/xorg-driver-video-nvidia.spec	Fri Nov  9 19:17:01 2007
@@ -12,7 +12,7 @@
 #
 %define		_nv_ver		100
 %define		_nv_rel		14.23
-%define		_rel		3
+%define		_rel		4
 #
 %define		need_x86	0
 %define		need_x8664	0
@@ -61,7 +61,6 @@
 Provides:	xorg-xserver-libglx
 %if !%{with multigl}
 Obsoletes:	Mesa
-Obsoletes:	Mesa-libGL
 %endif
 Obsoletes:	X11-OpenGL-core < 1:7.0.0
 Obsoletes:	X11-OpenGL-libGL < 1:7.0.0
@@ -69,6 +68,9 @@
 Obsoletes:	XFree86-OpenGL-libGL < 1:7.0.0
 Obsoletes:	XFree86-driver-nvidia
 Obsoletes:	XFree86-nvidia
+%if !%{with multigl}
+Conflicts:	Mesa-libGL
+%endif
 Conflicts:	XFree86-OpenGL-devel <= 4.2.0-3
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -360,7 +362,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.125  2007-11-01 07:37:51  shadzik
+Revision 1.126  2007-11-09 18:17:01  patrys
+- don't obsolete mesa-libgl
+
+Revision 1.125  2007/11/01 07:37:51  shadzik
 - rel 3 (rebuild with 2.6.22.10-4)
 
 Revision 1.124  2007/10/24 13:53:10  arekm
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-driver-video-fglrx.spec?r1=1.58&r2=1.59&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-driver-video-nvidia-legacy2.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-driver-video-nvidia-legacy.spec?r1=1.45&r2=1.46&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-driver-video-nvidia.spec?r1=1.125&r2=1.126&f=u