- fix building kernel module with kernel 4.4.169

[packages/xorg-driver-video-nvidia-legacy-340xx.git] / xorg-driver-video-nvidia-legacy-340xx.spec

diff --git a/xorg-driver-video-nvidia-legacy-340xx.spec b/xorg-driver-video-nvidia-legacy-340xx.spec
index 4b5de9df579ab5912604ab4ba926a4e8e65409bf..d46f5af017ab9ef7f7d3504c2c0af26e83622b0a 100644 (file)
--- a/xorg-driver-video-nvidia-legacy-340xx.spec
+++ b/xorg-driver-video-nvidia-legacy-340xx.spec
@@ -25,28 +25,30 @@ exit 1
 
 %define                no_install_post_check_so 1
 
-%define                rel     1
+%define                rel     2
 %define                pname   xorg-driver-video-nvidia-legacy-340xx
 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}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
 # when updating version here, keep nvidia-settings.spec in sync as well
-Version:       340.76
+Version:       340.107
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 Epoch:         1
 License:       nVidia Binary
 Group:         X11
 Source0:       http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
-# Source0-md5: 8064c0a0998c3e7ee3c98ac1832b8194
+# Source0-md5: 9a4b382ef545d836033630224735d5dd
 Source1:       http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5: 440df290e213280d6e20d4d4be6f8b4c
+# Source1-md5: ffca1879d77dfc491dfb0276ceb56cc1
 Source2:       xorg-driver-video-nvidia-xinitrc.sh
 Source3:       gl.pc.in
 Source4:       10-nvidia.conf
 Source5:       10-nvidia-modules.conf
 Patch0:                X11-driver-nvidia-GL.patch
 Patch1:                X11-driver-nvidia-desktop.patch
+Patch2:                linux-4.0.patch
+Patch3:                kernel-4.4.169.patch
 URL:           http://www.nvidia.com/object/unix.html
 BuildRequires: rpmbuild(macros) >= 1.701
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -54,7 +56,7 @@ BuildRequires:        sed >= 4.0
 BuildConflicts:        XFree86-nvidia
 Requires:      %{pname}-libs = %{epoch}:%{version}-%{rel}
 Requires:      xorg-xserver-server
-Requires:      xorg-xserver-server(videodrv-abi) <= 19.0
+Requires:      xorg-xserver-server(videodrv-abi) <= 24.0
 Requires:      xorg-xserver-server(videodrv-abi) >= 2.0
 Provides:      ocl-icd(nvidia)
 Provides:      ocl-icd-driver
@@ -175,7 +177,7 @@ Eszközök az nVidia grafikus kártyák beállításához.
 Narzędzia do zarządzania kartami graficznymi nVidia.
 
 %define        kernel_pkg()\
-%package -n kernel%{_alt_kernel}-video-nvidia\
+%package -n kernel%{_alt_kernel}-video-nvidia-legacy-340xx\
 Summary:       nVidia kernel module for nVidia Architecture support\
 Summary(de.UTF-8):     Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung\
 Summary(hu.UTF-8):     nVidia Architektúra támogatás Linux kernelhez.\
@@ -193,29 +195,29 @@ Requires: %{pname} = %{epoch}:%{version}\
 Provides:      X11-driver-nvidia(kernel)\
 Obsoletes:     XFree86-nvidia-kernel\
 \
-%description -n kernel%{_alt_kernel}-video-nvidia\
+%description -n kernel%{_alt_kernel}-video-nvidia-legacy-340xx\
 nVidia Architecture support for Linux kernel.\
 \
-%description -n kernel%{_alt_kernel}-video-nvidia -l de.UTF-8\
+%description -n kernel%{_alt_kernel}-video-nvidia-legacy-340xx -l de.UTF-8\
 Die nVidia-Architektur-Unterstützung für den Linux-Kern.\
 \
-%description -n kernel%{_alt_kernel}-video-nvidia -l hu.UTF-8\
+%description -n kernel%{_alt_kernel}-video-nvidia-legacy-340xx -l hu.UTF-8\
 nVidia Architektúra támogatás Linux kernelhez.\
 \
-%description -n kernel%{_alt_kernel}-video-nvidia -l pl.UTF-8\
+%description -n kernel%{_alt_kernel}-video-nvidia-legacy-340xx -l pl.UTF-8\
 Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez\
 sterownik nVidii dla Xorg/XFree86.\
 \
 %if %{with kernel}\
-%files -n kernel%{_alt_kernel}-video-nvidia\
+%files -n kernel%{_alt_kernel}-video-nvidia-legacy-340xx\
 %defattr(644,root,root,755)\
 /lib/modules/%{_kernel_ver}/misc/*.ko*\
 %endif\
 \
-%post  -n kernel%{_alt_kernel}-video-nvidia\
+%post  -n kernel%{_alt_kernel}-video-nvidia-legacy-340xx\
 %depmod %{_kernel_ver}\
 \
-%postun        -n kernel%{_alt_kernel}-video-nvidia\
+%postun        -n kernel%{_alt_kernel}-video-nvidia-legacy-340xx\
 %depmod %{_kernel_ver}\
 %{nil}
 
@@ -248,6 +250,8 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %endif
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
@@ -344,7 +348,7 @@ rm -rf $RPM_BUILD_ROOT
 %post
 cat << 'EOF'
 NOTE: You must also install kernel module for this driver to work
-  kernel%{_alt_kernel}-video-nvidia-%{version}
+  kernel%{_alt_kernel}-video-nvidia-legacy-340xx-%{version}
 
 EOF