up to 460.56

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

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index f7c26fcd672278a8da0426a88566217ce9ad42bb..b8fd7b0ad6aa3c73e91de7420064eff5b9df0386 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -19,35 +19,29 @@
 exit 1
 %endif
 
-%if %{without userspace}
-# nothing to be placed to debuginfo package
-%define                _enable_debug_packages  0
-%endif
-
 %define                no_install_post_check_so 1
 
-%define                rel     1
+%define                rel     2
 %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}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
 # when updating version here, keep nvidia-settings.spec in sync as well
-Version:       455.38
+Version:       460.56
 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_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run
-# Source0-md5: cd7ffa99cba79b05ee496e92368972ab
+# Source0-md5: 5851075ac80f5b5f0415ef5e31327e51
 Source2:       %{pname}-xinitrc.sh
 Source3:       gl.pc.in
 Source4:       10-nvidia.conf
 Source5:       10-nvidia-modules.conf
 Patch0:                X11-driver-nvidia-desktop.patch
-Patch1:                kernel-5.7.patch
 URL:           http://www.nvidia.com/object/unix.html
-BuildRequires: rpmbuild(macros) >= 1.701
+BuildRequires: rpmbuild(macros) >= 1.752
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.32}}
 BuildRequires: sed >= 4.0
 BuildConflicts:        XFree86-nvidia
@@ -57,7 +51,7 @@ Requires:     xorg-xserver-server(videodrv-abi) <= 24.1
 Requires:      xorg-xserver-server(videodrv-abi) >= 4.0
 Provides:      ocl-icd(nvidia)
 Provides:      ocl-icd-driver
-Provides:      vulkan(icd) = 1.1.119
+Provides:      vulkan(icd) = 1.2.155
 Provides:      xorg-driver-video
 Provides:      xorg-xserver-module(glx)
 Obsoletes:     XFree86-driver-nvidia
@@ -66,6 +60,8 @@ Conflicts:    XFree86-OpenGL-devel <= 4.2.0-3
 ExclusiveArch: %{?with_userspace:%{ix86}} %{x8664}
 BuildRoot:     %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 
+%define                _enable_debug_packages  0
+
 %define                _noautoreqdep   libGL.so.1 libnvcuvid.so
 # libnvidia-encode.so.*.* links with libnvcuvid.so instead of libnvcuvid.so.1
 %define                _noautoreq      libnvcuvid.so
@@ -156,9 +152,7 @@ firmy NVIDIA.
 %package doc
 Summary:       Documentation for NVIDIA Graphics Driver
 Group:         Documentation
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description doc
 NVIDIA Accelerated Linux Graphics Driver README and Installation
@@ -182,7 +176,6 @@ Eszközök az nVidia grafikus kártyák beállításához.
 %description progs -l pl.UTF-8
 Narzędzia do zarządzania kartami graficznymi nVidia.
 
-%ifarch %{x8664}
 %define        kernel_pkg()\
 %package -n kernel%{_alt_kernel}-video-nvidia\
 Summary:       nVidia kernel module for nVidia Architecture support\
@@ -237,6 +230,7 @@ cd ..\
 %install_kernel_modules -D installed -m kernel/nvidia-uvm -d misc\
 %{nil}
 
+%ifarch %{x8664}
 %{?with_kernel:%{expand:%create_kernel_packages}}
 %endif
 
@@ -246,7 +240,6 @@ rm -rf NVIDIA-Linux-x86_64-%{version}
 /bin/sh %{SOURCE0} --extract-only
 %setup -qDT -n NVIDIA-Linux-x86_64-%{version}
 %patch0 -p1
-%patch1 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
@@ -440,7 +433,7 @@ EOF
 %dir %{_sysconfdir}/OpenCL
 %dir %{_sysconfdir}/OpenCL/vendors
 %{_sysconfdir}/OpenCL/vendors/nvidia.icd
-%endif}
+%endif
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia*.conf
 %dir %{_libdir}/nvidia
 %if %{without system_libglvnd}