SPECS: X11-driver-nvidia-legacy.spec - cleanups, descs sync

[qboosh]

Author: qboosh                       Date: Tue Sep 13 12:55:35 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups, descs sync

---- Files affected:
SPECS:
   X11-driver-nvidia-legacy.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.8 SPECS/X11-driver-nvidia-legacy.spec:1.9
--- SPECS/X11-driver-nvidia-legacy.spec:1.8	Sun Sep 11 21:47:03 2005
+++ SPECS/X11-driver-nvidia-legacy.spec	Tue Sep 13 14:55:30 2005
@@ -33,7 +33,6 @@
 Patch2:		%{name}-conftest.patch
 # http://www.minion.de/files/1.0-6629/
 URL:		http://www.nvidia.com/object/linux.html
-BuildConflicts:	XFree86-nvidia
 BuildRequires:	grep
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
 BuildRequires:	%{kgcc_package}
@@ -41,6 +40,7 @@
 BuildRequires:	sed >= 4.0
 BuildRequires:	textutils
 #BuildRequires:	X11-devel >= %{_min_x11}	# disabled for now
+BuildConflicts:	XFree86-nvidia
 Requires:	X11-Xserver
 Requires:	X11-libs >= %{_min_x11}
 Requires:	X11-modules >= %{_min_x11}
@@ -72,18 +72,21 @@
 server as well as high performance OpenGL acceleration, AGP support,
 support for most flat panels, and multiple monitor support.
 
-Hardware: nVidia TNT, TNT2, GeForce, old GeForce2 or Quadro based graphics
-accelerator. The nVidia NV1 and RIVA 128/128ZX chips are supported in
-the base XFree86 4.0 install and are not supported by this driver set.
+Hardware: nVidia TNT, TNT2, GeForce, old GeForce2 or Quadro based
+graphics accelerator. New GeForce2, GeForce3 and GeForce4 adapters
+are supported by X11-driver-nvidia package. The nVidia NV1 and RIVA
+128/128ZX chips are supported in the base Xorg or XFree86 install and
+are not supported by this driver set.
 
 %description -l pl
 Usprawnione sterowniki dla kart graficznych nVidia do serwera X dające
 wysokowydajną akcelerację OpenGL, obsługę AGP i wiele monitorów.
 
-Obsługują karty nVidia TNT/TNT2/GeForce/stare GeForce2/Quadro do serwera Xorg.
-Dla kart GF2 (nowych), GF3 i GF4 jest pakiet X11-driver-nvidia.
-Karty nVidia NV1 i Riva 128/128ZX są obsługiwane przez sterownik nv z
-pakietów XFree86 - NIE są obsługiwane przez ten pakiet.
+Obsługują karty nVidia TNT/TNT2/GeForce/stare GeForce2/Quadro do
+serwera Xorg. Dla kart GF2 (nowych), GF3 i GF4 jest pakiet
+X11-driver-nvidia. Karty nVidia NV1 i Riva 128/128ZX są obsługiwane
+przez sterownik nv z pakietów Xorg lub XFree86 - NIE są obsługiwane
+przez ten pakiet.
 
 %package devel
 Summary:	OpenGL for X11R6 development (only gl?.h)
@@ -108,10 +111,10 @@
 Summary:	Tools for advanced control of nVidia graphic cards
 Summary(pl):	Narzędzia do zarządzania kartami graficznymi nVidia
 Group:		Applications/System
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	XFree86-driver-nvidia-progs
 Obsoletes:	%{oldname}-progs < 1.0.7174
 Conflicts:	%{oldname}-progs
-Requires:	%{name} = %{version}-%{release}
 
 %description progs
 Tools for advanced control of nVidia graphic cards.
@@ -142,7 +145,7 @@
 
 %description -n kernel-video-nvidia-legacy -l pl
 Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez
-sterownik nVidii dla XFree86 4.
+sterownik nVidii dla Xorg/XFree86.
 
 %package -n kernel-smp-video-nvidia-legacy
 Summary:	nVidia kernel module for nVidia Architecture support
@@ -166,7 +169,7 @@
 
 %description -n kernel-smp-video-nvidia-legacy -l pl
 Obsługa architektury nVidia dla jądra Linuksa SMP. Pakiet wymagany
-przez sterownik nVidii dla XFree86 4.
+przez sterownik nVidii dla Xorg/XFree86.
 
 %prep
 cd %{_builddir}
@@ -344,6 +347,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/09/13 12:55:30  qboosh
+- cleanups, descs sync
+
 Revision 1.8  2005/09/11 19:47:03  wolvverine
 - correct
 - STBR
================================================================

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