Attachment 13811 Details for Bug 31874 – fix for nvidia470 to avoid conflicts with nvidia-current

[patch] fix for nvidia470 to avoid conflicts with nvidia-current

nvidia470.spec.diff (text/plain), 2.67 KB, created by Giuseppe Ghibò on 2023-05-07 13:54:57 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Giuseppe Ghibò

Created: 2023-05-07 13:54:57 CEST

Size: 2.67 KB

patch

obsolete

>Index: nvidia470.spec
>===================================================================
>--- nvidia470.spec	(revision 1956061)
>+++ nvidia470.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		470.182.03
> #
>-%define rel		2
>+%define rel		3
> # the highest supported videodrv abi (currently xorg 21.1)
> %define videodrv_abi	25
> 
>@@ -53,6 +53,20 @@
> %define nvidia_datadir		%{_datadir}/%{drivername}
> %define nvidia_datadir_std	%{_datadir}/nvidia
> 
>+# Conflict names to let package be mutually exclusive against non-nvidia-current driver
>+# For now works for just nvidia-current and nvidia470 being mutually exclusive. If there
>+# will be newer driver series to the family, please adjust this and below.
>+#
>+%if %{with use_pkgname_as_nvidia_current}
>+%define conflictname		nvidia470
>+%define driverconflictname	nvidia470
>+%define driverpkgconflictname	x11-driver-video-%{driverconflictname}
>+%else
>+%define conflictname		nvidia-current
>+%define driverconflictname	nvidia-current
>+%define driverpkgconflictname	x11-driver-video-%{driverconflictname}
>+%endif
>+
> %ifarch %{ix86}
> %define nsource %{SOURCE0}
> %endif
>@@ -133,6 +147,9 @@
> Summary:	NVIDIA proprietary X.org driver and libraries for %cards
> Group:		System/Kernel and hardware
> Conflicts:	%{drivername}-cuda-opencl < 430.14-2
>+# conflicts with other nvidia series (e.g. x11-driver-video-nvidia-current)
>+Conflicts:	%{driverpkgconflictname}
>+#
> Requires:	%{drivername}-utils = %{version}-%{release}
> Requires(post): update-alternatives
> Requires(postun): update-alternatives
>@@ -191,6 +208,9 @@
> Summary:	NVIDIA OpenGL/CUDA development libraries and headers
> Group:		Development/C
> Conflicts:	%{drivername}-cuda-opencl < 430.14-3
>+# conflicts with other nvidia series (e.g. nvidia-current-devel),
>+Conflicts:	%{driverconflictname}-devel
>+#
> Requires:	%{drivername}-cuda-opencl = %{version}-%{release}
> Requires:	%{_lib}vdpau-devel
> 
>@@ -204,6 +224,9 @@
> Provides:	%{drivername}-cuda = %{version}-%{release}
> Conflicts:	%{drivername}-devel < 430.14-3
> Conflicts:	%{driverpkgname} < 430.14-2
>+# conflicts with other nvidia series (e.g. nvidia-current-cuda-opencl)
>+Conflicts:	%{driverconflictname}-cuda-opencl
>+#
> Requires:	kmod(%{modulename}.ko) = %{version}
> Requires:	%{drivername}-utils = %{version}-%{release}
> 
>@@ -225,6 +248,8 @@
> Summary:	Utilities for NVIDIA proprietary driver
> Group:		System/Kernel and hardware
> Conflicts:	%{driverpkgname} < 430.26-1
>+# conflicts with other nvidia series (e.g. nvidia-current-utils)
>+Conflicts:	%{driverconflictname}-utils
> 
> %description -n %{drivername}-utils
> Utilities for NVIDIA proprietary driver. Currently provides nvidia-smi and

Index: nvidia470.spec
===================================================================
--- nvidia470.spec	(revision 1956061)
+++ nvidia470.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		470.182.03
 #
-%define rel		2
+%define rel		3
 # the highest supported videodrv abi (currently xorg 21.1)
 %define videodrv_abi	25
 
@@ -53,6 +53,20 @@
 %define nvidia_datadir		%{_datadir}/%{drivername}
 %define nvidia_datadir_std	%{_datadir}/nvidia
 
+# Conflict names to let package be mutually exclusive against non-nvidia-current driver
+# For now works for just nvidia-current and nvidia470 being mutually exclusive. If there
+# will be newer driver series to the family, please adjust this and below.
+#
+%if %{with use_pkgname_as_nvidia_current}
+%define conflictname		nvidia470
+%define driverconflictname	nvidia470
+%define driverpkgconflictname	x11-driver-video-%{driverconflictname}
+%else
+%define conflictname		nvidia-current
+%define driverconflictname	nvidia-current
+%define driverpkgconflictname	x11-driver-video-%{driverconflictname}
+%endif
+
 %ifarch %{ix86}
 %define nsource %{SOURCE0}
 %endif
@@ -133,6 +147,9 @@
 Summary:	NVIDIA proprietary X.org driver and libraries for %cards
 Group:		System/Kernel and hardware
 Conflicts:	%{drivername}-cuda-opencl < 430.14-2
+# conflicts with other nvidia series (e.g. x11-driver-video-nvidia-current)
+Conflicts:	%{driverpkgconflictname}
+#
 Requires:	%{drivername}-utils = %{version}-%{release}
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
@@ -191,6 +208,9 @@
 Summary:	NVIDIA OpenGL/CUDA development libraries and headers
 Group:		Development/C
 Conflicts:	%{drivername}-cuda-opencl < 430.14-3
+# conflicts with other nvidia series (e.g. nvidia-current-devel),
+Conflicts:	%{driverconflictname}-devel
+#
 Requires:	%{drivername}-cuda-opencl = %{version}-%{release}
 Requires:	%{_lib}vdpau-devel
 
@@ -204,6 +224,9 @@
 Provides:	%{drivername}-cuda = %{version}-%{release}
 Conflicts:	%{drivername}-devel < 430.14-3
 Conflicts:	%{driverpkgname} < 430.14-2
+# conflicts with other nvidia series (e.g. nvidia-current-cuda-opencl)
+Conflicts:	%{driverconflictname}-cuda-opencl
+#
 Requires:	kmod(%{modulename}.ko) = %{version}
 Requires:	%{drivername}-utils = %{version}-%{release}
 
@@ -225,6 +248,8 @@
 Summary:	Utilities for NVIDIA proprietary driver
 Group:		System/Kernel and hardware
 Conflicts:	%{driverpkgname} < 430.26-1
+# conflicts with other nvidia series (e.g. nvidia-current-utils)
+Conflicts:	%{driverconflictname}-utils
 
 %description -n %{drivername}-utils
 Utilities for NVIDIA proprietary driver. Currently provides nvidia-smi and

Actions: View | Diff

Attachments on bug 31874: 13811 | 13812 | 13813 | 13818