SPECS: xorg-driver-video-nvidia.spec - make it work with xorg 1.5 - wfb.so ...

[patrys]

Author: patrys                       Date: Sun Sep  7 14:36:46 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- make it work with xorg 1.5
- wfb.so is not meant for Xservers that have libwfb.so
- rel 7

---- Files affected:
SPECS:
   xorg-driver-video-nvidia.spec (1.173 -> 1.174) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-nvidia.spec
diff -u SPECS/xorg-driver-video-nvidia.spec:1.173 SPECS/xorg-driver-video-nvidia.spec:1.174
--- SPECS/xorg-driver-video-nvidia.spec:1.173	Tue Sep  2 08:42:26 2008
+++ SPECS/xorg-driver-video-nvidia.spec	Sun Sep  7 16:36:40 2008
@@ -20,7 +20,7 @@
 %endif
 
 %define		pname		xorg-driver-video-nvidia
-%define		rel		6
+%define		rel		7
 
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(pl.UTF-8):	Sterowniki do kart graficznych nVidia GeForce/Quadro
@@ -45,7 +45,8 @@
 BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	xorg-xserver-server
-Requires:	xorg-xserver-server(videodrv-abi) = 2.0
+Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
+Requires:	xorg-xserver-server(videodrv-abi) <= 4.1
 Provides:	OpenGL = 2.1
 Provides:	OpenGL-GLX = 1.4
 Provides:	xorg-xserver-libglx
@@ -231,7 +232,6 @@
 install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
 
 ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
-ln -sf libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/wfb.so
 
 %if %{with multigl}
 echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf
@@ -316,7 +316,6 @@
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so*
 %endif
 %attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*
-%attr(755,root,root) %{_libdir}/xorg/modules/wfb.so
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 
 %files devel
@@ -358,6 +357,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.174  2008/09/07 14:36:40  patrys
+- make it work with xorg 1.5
+- wfb.so is not meant for Xservers that have libwfb.so
+- rel 7
+
 Revision 1.173  2008/09/02 06:42:26  arekm
 - release 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-driver-video-nvidia.spec?r1=1.173&r2=1.174&f=u