Attachment 13882 Details for Bug 32022 – patch for nvidia-current spec file

[patch] patch for nvidia-current spec file

nvidia-current.spec.new.diff (text/plain), 1.62 KB, created by Giuseppe Ghibò on 2023-06-19 13:03:53 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Giuseppe Ghibò

Created: 2023-06-19 13:03:53 CEST

Size: 1.62 KB

patch

obsolete

>Index: nvidia-current.spec
>===================================================================
>--- nvidia-current.spec	(revision 1962441)
>+++ nvidia-current.spec	(working copy)
>@@ -22,7 +22,7 @@
> # version of the utils (usually should be in sync with main version, except for beta drivers)
> %define utilver		%{version}
> #
>-%define rel		1
>+%define rel		2
> # the highest supported videodrv abi (currently xorg 21.1)
> %define videodrv_abi	25
> 
>@@ -1081,6 +1081,16 @@
> # dont ship open drivers as part of this, must be in a separate package in core
> rm -rf %{buildroot}%{_usrsrc}/%{drivername}-%{version}-%{release}-open
> 
>+# libnvidia-pkcs11.so is linked against libcrypto.so.1.1 which is
>+# provided only in mga8, viceversa libnvidia-pkcs11-openssl3.so is
>+# linked against libcrypto.so.3, which is provided only in mga9 and
>+# beyond.
>+%if %mgaversion >= 9
>+rm -f %{buildroot}%{nvidia_libdir}/libnvidia-pkcs11.so.%{version}
>+%else
>+rm -f %{buildroot}%{nvidia_libdir}/libnvidia-pkcs11-openssl3.so.%{version}
>+%endif
>+
> export EXCLUDE_FROM_STRIP="$(find %{buildroot} -type f \! -name nvidia-settings \! -name nvidia-xconfig \! -name nvidia-modprobe \! -name nvidia-persistenced \! -name 'libnvidia-gtk*.so')"
> 
> 
>@@ -1249,8 +1259,11 @@
> %{nvidia_libdir}/libnvidia-gtk3.so.%{version}
> %{nvidia_libdir}/libnvidia-ngx.so.1
> %{nvidia_libdir}/libnvidia-ngx.so.%{version}
>+%if %{mgaversion} >= 9
> %{nvidia_libdir}/libnvidia-pkcs11-openssl3.so.%{version}
>+%else
> %{nvidia_libdir}/libnvidia-pkcs11.so.%{version}
>+%endif
> %{nvidia_libdir}/libnvidia-rtcore.so.%{version}
> %{nvidia_libdir}/libnvidia-tls.so.%{version}
> %{nvidia_libdir}/libnvidia-wayland-client.so.%{version}

Index: nvidia-current.spec
===================================================================
--- nvidia-current.spec	(revision 1962441)
+++ nvidia-current.spec	(working copy)
@@ -22,7 +22,7 @@
 # version of the utils (usually should be in sync with main version, except for beta drivers)
 %define utilver		%{version}
 #
-%define rel		1
+%define rel		2
 # the highest supported videodrv abi (currently xorg 21.1)
 %define videodrv_abi	25
 
@@ -1081,6 +1081,16 @@
 # dont ship open drivers as part of this, must be in a separate package in core
 rm -rf %{buildroot}%{_usrsrc}/%{drivername}-%{version}-%{release}-open
 
+# libnvidia-pkcs11.so is linked against libcrypto.so.1.1 which is
+# provided only in mga8, viceversa libnvidia-pkcs11-openssl3.so is
+# linked against libcrypto.so.3, which is provided only in mga9 and
+# beyond.
+%if %mgaversion >= 9
+rm -f %{buildroot}%{nvidia_libdir}/libnvidia-pkcs11.so.%{version}
+%else
+rm -f %{buildroot}%{nvidia_libdir}/libnvidia-pkcs11-openssl3.so.%{version}
+%endif
+
 export EXCLUDE_FROM_STRIP="$(find %{buildroot} -type f \! -name nvidia-settings \! -name nvidia-xconfig \! -name nvidia-modprobe \! -name nvidia-persistenced \! -name 'libnvidia-gtk*.so')"
 
 
@@ -1249,8 +1259,11 @@
 %{nvidia_libdir}/libnvidia-gtk3.so.%{version}
 %{nvidia_libdir}/libnvidia-ngx.so.1
 %{nvidia_libdir}/libnvidia-ngx.so.%{version}
+%if %{mgaversion} >= 9
 %{nvidia_libdir}/libnvidia-pkcs11-openssl3.so.%{version}
+%else
 %{nvidia_libdir}/libnvidia-pkcs11.so.%{version}
+%endif
 %{nvidia_libdir}/libnvidia-rtcore.so.%{version}
 %{nvidia_libdir}/libnvidia-tls.so.%{version}
 %{nvidia_libdir}/libnvidia-wayland-client.so.%{version}

Actions: View | Diff

Attachments on bug 32022: 13879 | 13882