%bcond_without kernel # without kernel packages
%bcond_without userspace # don't build userspace programs
%bcond_with force_userspace # force userspace build (useful if alt_kernel is set)
+%bcond_with settings # package nvidia-settings here (GPL version of same packaged from nvidia-settings.spec)
%bcond_with verbose # verbose build (V=1)
%if "%{_alt_kernel}" != "%{nil}"
%endif
%define no_install_post_check_so 1
-%define rel 16
+%define rel 1
%define pname xorg-driver-video-nvidia
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}%{_alt_kernel}
# when updating version here, keep nvidia-settings.spec in sync as well
-Version: 310.32
+Version: 319.17
Release: %{rel}
Epoch: 1
License: nVidia Binary
Group: X11
Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
-# Source0-md5: 219608da023a318e2c023497e5ba9296
+# Source0-md5: 993eee683aea53b7965a853ccde3d740
Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5: 2e9a8aeb74c17df70376fd59ff1c4125
+# Source1-md5: 4dda9b3e5c24136bebfaad122715c202
Source2: %{pname}-xinitrc.sh
Source3: gl.pc.in
Source4: 10-nvidia.conf
BuildConflicts: XFree86-nvidia
Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
Requires: xorg-xserver-server
-Requires: xorg-xserver-server(videodrv-abi) <= 13.1
+Requires: xorg-xserver-server(videodrv-abi) <= 14.1
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
Provides: xorg-driver-video
Provides: xorg-xserver-module(glx)
$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} \
$RPM_BUILD_ROOT%{_sysconfdir}/{OpenCL/vendors,ld.so.conf.d,X11/xorg.conf.d}
-install -p nvidia-{settings,smi,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
-install -p nvidia-cuda-proxy-{control,server} $RPM_BUILD_ROOT%{_bindir}
-cp -p nvidia-{settings,smi,xconfig,cuda-proxy-control}.* $RPM_BUILD_ROOT%{_mandir}/man1
+%if %{with settings}
+install -p nvidia-settings $RPM_BUILD_ROOT%{_bindir}
+cp -p nvidia-settings.1* $RPM_BUILD_ROOT%{_mandir}/man1
cp -p nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
cp -p nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
+%endif
+
+install -p nvidia-{smi,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
+install -p nvidia-cuda-mps-{control,server} $RPM_BUILD_ROOT%{_bindir}
+cp -p nvidia-{smi,xconfig,cuda-mps-control}.1* $RPM_BUILD_ROOT%{_mandir}/man1
install -p nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors
install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d
%files progs
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/nvidia-bug-report.sh
-%attr(755,root,root) %{_bindir}/nvidia-cuda-proxy-control
-%attr(755,root,root) %{_bindir}/nvidia-cuda-proxy-server
-%attr(755,root,root) %{_bindir}/nvidia-settings
+%attr(755,root,root) %{_bindir}/nvidia-cuda-mps-control
+%attr(755,root,root) %{_bindir}/nvidia-cuda-mps-server
%attr(755,root,root) %{_bindir}/nvidia-smi
%attr(755,root,root) %{_bindir}/nvidia-xconfig
+%{_mandir}/man1/nvidia-cuda-mps-control.1*
+%{_mandir}/man1/nvidia-smi.1*
+%{_mandir}/man1/nvidia-xconfig.1*
+%if %{with settings}
%attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
+%attr(755,root,root) %{_bindir}/nvidia-settings
+%{_mandir}/man1/nvidia-settings.1*
%{_desktopdir}/nvidia-settings.desktop
-%{_mandir}/man1/nvidia-*
%{_pixmapsdir}/nvidia-settings.png
%endif
+%endif
%if %{with kernel}
%files -n kernel%{_alt_kernel}-video-nvidia