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=2cf513f69c82ef11269ab0fe35e6c9752bc1554e;hp=b4deeabf9b08f8c7e079c1faff83b7abad18bdd8;hb=2d78523c04bc88758d0135f40f15f64089e670d5;hpb=f3b8319b4d97da45b0b73797664cc4ed919c2f69

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index b4deeab..2cf513f 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -24,21 +24,21 @@
 %endif
 
 %define		pname		xorg-driver-video-nvidia
-%define		rel		2
+%define		rel		4
 
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez
 Summary(pl.UTF-8):	Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:		%{pname}
-Version:	190.53
+Version:	256.35
 Release:	%{rel}%{?with_multigl:.mgl}
 Epoch:		1
 License:	nVidia Binary
 Group:		X11
-Source0:	http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
-# Source0-md5:	2e80419f6f9ac16beecd839874d0c5ab
-Source1:	http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
-# Source1-md5:	3d3e956366f9df0e4c64d2e0299d1029
+Source0:	http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
+# Source0-md5:	f6af8917a500de28396a438f3f548c88
+Source1:	http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
+# Source1-md5:	7b5924f14a4d2326b4d916efdb7852ff
 Source2:	%{pname}-xinitrc.sh
 Source3:	gl.pc.in
 Patch0:		X11-driver-nvidia-GL.patch
@@ -53,7 +53,7 @@ BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	%{pname}-libs = %{epoch}:%{version}-%{rel}
 Requires:	xorg-xserver-server
-Requires:	xorg-xserver-server(videodrv-abi) <= 6.0
+Requires:	xorg-xserver-server(videodrv-abi) <= 7.0
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
 Provides:	xorg-xserver-module(glx)
 Obsoletes:	XFree86-driver-nvidia
@@ -62,7 +62,7 @@ Conflicts:	XFree86-OpenGL-devel <= 4.2.0-3
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_noautoreqdep	libGL.so.1 libGLcore.so.1
+%define		_noautoreqdep	libGL.so.1
 
 %description
 This driver set adds improved 2D functionality to the Xorg X server as
@@ -164,6 +164,14 @@ Statikus XwMCNVIDIA könyvtár.
 %description static -l pl.UTF-8
 Statyczna biblioteka XvMCNVIDIA.
 
+%package doc
+Summary:	Documentation for NVIDIA Graphics Driver
+Group:		Documentation
+
+%description doc
+NVIDIA Accelerated Linux Graphics Driver README and Installation
+Guide.
+
 %package progs
 Summary:	Tools for advanced control of nVidia graphic cards
 Summary(hu.UTF-8):	Eszközök az nVidia grafikus kártyák beállításához
@@ -211,33 +219,21 @@ sterownik nVidii dla Xorg/XFree86.
 
 %prep
 cd %{_builddir}
-rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
+rm -rf NVIDIA-Linux-x86*-%{version}*
 %ifarch %{ix86}
 /bin/sh %{SOURCE0} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86-%{version}-pkg0
+%setup -qDT -n NVIDIA-Linux-x86-%{version}
 %else
 /bin/sh %{SOURCE1} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg0
+%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-no-compat32
 %endif
 %patch0 -p1
 %patch1 -p1
-echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
-
-mv usr/share/doc .
-mv usr/bin .
-mv usr/share/man/man1 man
-mv usr/share/applications xdg
-mv usr/share/pixmaps/* xdg
-mv usr/src/nv src
-mv usr/lib/tls lib
-mv usr/lib/* lib
-mv usr/X11R6/lib/modules lib/xorg
-mv usr/X11R6/lib/* lib
-mv usr/include .
+echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
 %if %{with kernel}
-cd src
+cd kernel
 ln -sf Makefile.kbuild Makefile
 cat >> Makefile <<'EOF'
 
@@ -259,18 +255,19 @@ install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
 install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d}
 %endif
 
-install -p bin/nvidia-{settings,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
-cp -a man/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
-cp -a xdg/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
-cp -a xdg/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install -p nvidia-{settings,smi,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
+cp -a nvidia-{settings,smi,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
+cp -a nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
 
 for f in \
-	lib/libnvidia-tls.so.%{version}		\
-	lib/libnvidia-cfg.so.%{version}		\
-	lib/libGL{,core}.so.%{version}		\
-	lib/libcuda.so.%{version}			\
-	lib/libXvMCNVIDIA.so.%{version}	\
+	libGL.so.%{version}			\
+	libXvMCNVIDIA.so.%{version}		\
+	libcuda.so.%{version}			\
+	libnvidia-cfg.so.%{version}		\
+	libnvidia-glcore.so.%{version}		\
+	tls/libnvidia-tls.so.%{version}		\
 ; do
 %if %{without multigl}
 	install -p $f $RPM_BUILD_ROOT%{_libdir}
@@ -279,18 +276,18 @@ for f in \
 %endif
 done
 
-cp -a lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
-install -p lib/vdpau/libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
+cp -a libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
+install -p libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
 
-install -p lib/xorg/extensions/libglx.so.%{version} \
+install -p libglx.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
-install -p lib/xorg/drivers/nvidia_drv.so \
+install -p nvidia_drv.so \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version}
-install -p lib/xorg/libnvidia-wfb.so.%{version} \
+install -p libnvidia-wfb.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules
 
-cp -a include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
-cp -a include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda
+cp -a gl*.h $RPM_BUILD_ROOT%{_includedir}/GL
+cp -a cuda*.h $RPM_BUILD_ROOT%{_includedir}/cuda
 
 ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
 ln -sf nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -320,7 +317,7 @@ ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
 %endif
 
 %if %{with kernel}
-%install_kernel_modules -m src/nvidia -d misc
+%install_kernel_modules -m kernel/nvidia -d misc
 %endif
 
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
@@ -349,6 +346,7 @@ fi
 /sbin/ldconfig -N %{_libdir}/xorg/modules/extensions
 # until versioned SONAME is built for nvidia_drv.so, update symlink manually
 ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so
+ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
 %endif
 
 %post	libs
@@ -368,8 +366,7 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc LICENSE
-%doc doc/{README.txt,NVIDIA_Changelog,XF86Config.sample}
+%doc LICENSE NVIDIA_Changelog README.txt
 %attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
 %attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/libglx.so
@@ -383,9 +380,10 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 %dir %{_libdir}/nvidia
 %attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libGLcore.so.*.*
+%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
 %attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
+%attr(755,root,root) %{_libdir}/libcuda.so
 %attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.*
@@ -395,9 +393,11 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 # 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}/libnvidia-glcore.so.*.*
+%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libXvMCNVIDIA_dynamic.so.1
+%attr(755,root,root) %{_libdir}/libcuda.so
 %attr(755,root,root) %{_libdir}/libcuda.so.*.*
 %attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.*
 %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*
@@ -407,8 +407,6 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
-%attr(755,root,root) %{_libdir}/libcuda.so
 %dir %{_includedir}/GL
 %{_includedir}/GL/gl.h
 %{_includedir}/GL/glext.h
@@ -424,11 +422,16 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 %defattr(644,root,root,755)
 %{_libdir}/libXvMCNVIDIA.a
 
+%files doc
+%defattr(644,root,root,755)
+%doc html/*
+
 %files progs
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/nvidia-bug-report.sh
 %attr(755,root,root) %{_bindir}/nvidia-settings
+%attr(755,root,root) %{_bindir}/nvidia-smi
 %attr(755,root,root) %{_bindir}/nvidia-xconfig
-%attr(755,root,root) %{_bindir}/nvidia-bug-report.sh
 %attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
 %{_desktopdir}/nvidia-settings.desktop
 %{_mandir}/man1/nvidia-*