X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=f14627d4f9b948a1e49c138cf5a16384e6f8a7da;hp=a5496e049c74ab15f56fa3fc31101b55f6f0eff4;hb=1b8b76469aa8e7632ebcfcfc23cb219dc8c36424;hpb=931d085ffb489e58254f0ac3c8825d8af2079dba

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index a5496e0..f14627d 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -9,7 +9,7 @@
 %define		no_install_post_strip 1
 #
 %define		_nv_ver		100
-%define		_nv_rel		14.09
+%define		_nv_rel		14.11
 %define		_min_x11	6.7.0
 %define		_rel		1
 #
@@ -36,11 +36,11 @@ License:	nVidia Binary
 Group:		X11
 %if %{need_x86}
 Source0:	http://us.download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}.%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}.%{_nv_rel}-pkg1.run
-# Source0-md5:	7b021b460ce1b1c533d97a51f2dde133
+# Source0-md5:	3e76376b5f1a53e0c18694fa65691c75
 %endif
 %if %{need_x8664}
 Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}.%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}.%{_nv_rel}-pkg2.run
-# Source1-md5:	0717c0468378647f1e4468c12c1ed72a
+# Source1-md5:	060dfcab02bc903ce6f18da4fad6f74f
 %endif
 Source2:	%{name}-xinitrc.sh
 Patch0:		X11-driver-nvidia-GL.patch
@@ -54,8 +54,8 @@ BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	xorg-xserver-server
-Provides:	OpenGL = 1.5
-Provides:	OpenGL-GLX
+Provides:	OpenGL = 2.1
+Provides:	OpenGL-GLX = 1.4
 Provides:	xorg-xserver-libglx
 Obsoletes:	Mesa
 Obsoletes:	Mesa-libGL
@@ -96,23 +96,36 @@ Starsze układy graficzne nie są obsługiwane przez ten pakiet:
   sterowniki -legacy
 
 %package devel
-Summary:	OpenGL for X11R6 development (only gl?.h)
-Summary(pl.UTF-8):	Pliki nagłówkowe OpenGL dla systemu X11R6 (tylko gl?.h)
+Summary:	OpenGL (GL and GLX) header files
+Summary(pl.UTF-8):	Pliki nagłówkowe OpenGL (GL i GLX)
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Provides:	OpenGL-GLX-devel
-Provides:	OpenGL-devel = 1.5
-Provides:	OpenGL-devel-base
-Obsoletes:	OpenGL-devel-base
+Provides:	OpenGL-GLX-devel = 1.4
+Provides:	OpenGL-devel = 2.1
+Obsoletes:	X11-OpenGL-devel-base
+Obsoletes:	XFree86-OpenGL-devel-base
 Obsoletes:	XFree86-driver-nvidia-devel
 Conflicts:	XFree86-OpenGL-devel < 4.3.99.902-0.3
 
 %description devel
-Base headers (only gl?.h) for OpenGL for X11R6 for nvidia drivers.
+OpenGL header files (GL and GLX only) for NVIDIA OpenGL
+implementation.
 
 %description devel -l pl.UTF-8
-Podstawowe pliki nagłówkowe (tylko gl?.h) OpenGL dla systemu X11R6 dla
-sterowników nvidii.
+Pliki nagłówkowe OpenGL (tylko GL i GLX) dla implementacji OpenGL
+firmy NVIDIA.
+
+%package static
+Summary:	Static XvMCNVIDIA library
+Summary(pl.UTF-8):	Statyczna biblioteka XvMCNVIDIA
+Group:		X11/Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static XvMCNVIDIA library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka XvMCNVIDIA.
 
 %package progs
 Summary:	Tools for advanced control of nVidia graphic cards
@@ -230,16 +243,9 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 cat << EOF
-
- *******************************************************
- *                                                     *
- *  NOTE:                                              *
- *  You must install:                                  *
- *  kernel(24)-video-nvidia-%{version}             *
- *  for this driver to work                            *
- *                                                     *
- *******************************************************
-
+NOTE: You must install:
+kernel-video-nvidia-%{version}
+for this driver to work
 EOF
 
 %postun	-p /sbin/ldconfig
@@ -255,11 +261,11 @@ EOF
 %defattr(644,root,root,755)
 %doc LICENSE
 %doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html}
-# OpenGL ABI for Linux compatibility
-%attr(755,root,root) %{_libdir}/libGL.so
-%attr(755,root,root) %{_libdir}/libGL.so.1
-#
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libGL.so.1
+# symlink for binary apps which fail to conform Linux OpenGL ABI
+# (and dlopen libGL.so instead of libGL.so.1)
+%attr(755,root,root) %{_libdir}/libGL.so
 %attr(755,root,root) %{_libdir}/libGLcore.so.*.*
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA_dynamic.so.1
@@ -269,20 +275,18 @@ EOF
 %attr(755,root,root) %{_libdir}/xorg/modules/wfb.so
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so*
-%endif
-
-%if %{with kernel}
-%files -n kernel%{_alt_kernel}-video-nvidia
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/*.ko*
-%endif
 
-%if %{with userspace}
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
-%{_includedir}/GL/*.h
-# -static
+%dir %{_includedir}/GL
+%{_includedir}/GL/gl.h
+%{_includedir}/GL/glext.h
+%{_includedir}/GL/glx.h
+%{_includedir}/GL/glxext.h
+
+%files static
+%defattr(644,root,root,755)
 %{_libdir}/libXvMCNVIDIA.a
 
 %files progs
@@ -295,3 +299,9 @@ EOF
 %{_mandir}/man1/nvidia-*
 %{_pixmapsdir}/nvidia-settings.png
 %endif
+
+%if %{with kernel}
+%files -n kernel%{_alt_kernel}-video-nvidia
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/*.ko*
+%endif