Sync from SUSE:SLFO:Main ocl-icd revision 4a2724b64bc47851d26e8ae703181e88

baselibs.conf

@@ -1,5 +1,3 @@
 libOpenCL1
-	# has update-alternatives in main architecture, but lets use symlink here
-	post "ln -sf /usr/%_lib/ocl-icd/libOpenCL.so.1 /usr/%_lib/libOpenCL.so.1"
 ocl-icd-devel
 	requires "libOpenCL1-<targettype> = %version"

ocl-icd.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Nov 11 11:52:00 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- nvidia-compute-G06: fixed conflicts to nvidia-compute-G06;
+  the requires to libOpenCL1 is already in since 550.120; so do
+  the conflicts for anything < 550.120 (boo#1233169)
+
+-------------------------------------------------------------------
+Fri Nov  8 13:04:42 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- get rid of update-alternatives; it's no longer needed because with
+  upcoming G06 production driver, the nvidia packages will rely on
+  this implementation (JIRA#PED-11444)
+- added conflicts to packages for legacy nvidia drivers (G04,G05)
+
 -------------------------------------------------------------------
 Wed May 17 23:21:09 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
 

ocl-icd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ocl-icd
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -44,10 +44,9 @@ ICD (driver backend).
 %package     -n libOpenCL1
 Summary:        OpenCL ICD Bindings
 Suggests:       pocl
-%if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
+Conflicts:      nvidia-compute-G04
-Requires(post): update-alternatives
+Conflicts:      nvidia-compute-G05
-Requires(pre):  update-alternatives
+Conflicts:      nvidia-compute-G06 < 550.120
-%endif
 
 %description -n libOpenCL1
 OpenCL is a royalty-free standard for cross-platform, parallel programming
@@ -82,56 +81,17 @@ use ocl-icd for ICD functionality.
 find %{buildroot} -type f -name "*.la" -delete -print
 rm -rf instdocs
 mv %{buildroot}%{_datadir}/doc/%{name} instdocs
-%if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
-install -d %{buildroot}/%{_sysconfdir}/alternatives \
-           %{buildroot}/%{_libdir}/ocl-icd
-mv %{buildroot}/%{_libdir}/libOpenCL.so.1* %{buildroot}/%{_libdir}/ocl-icd
-ln -snf ocl-icd/libOpenCL.so.1 %{buildroot}/%{_libdir}/libOpenCL.so
-# dummy target for update-alternatives
-ln -s %{_sysconfdir}/alternatives/libOpenCL.so.1 %{buildroot}/%{_libdir}/libOpenCL.so.1
-ln -s %{_libdir}/ocl-icd/libOpenCL.so.1 %{buildroot}/%{_sysconfdir}/alternatives/libOpenCL.so.1
-%endif
 
-%if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
-%post -n libOpenCL1
-# apparently needed when updating from a pre update-alternatives package ...
-rm -f %{_libdir}/libOpenCL.so.1.*
-%{_sbindir}/update-alternatives --force --install \
-   %{_libdir}/libOpenCL.so.1 libOpenCL.so.1 %{_libdir}/ocl-icd/libOpenCL.so.1  50
-/sbin/ldconfig
-
-%preun -n libOpenCL1
-if [ "$1" = 0 ] ; then
-   %{_sbindir}/update-alternatives --remove libOpenCL.so.1  %{_libdir}/ocl-icd/libOpenCL.so.1
-fi
-%else
 %post -n libOpenCL1 -p /sbin/ldconfig
-%endif
 
 %postun -n libOpenCL1 -p /sbin/ldconfig
 
-%if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
-%posttrans -n libOpenCL1
-if [ "$1" = 0 ] ; then
-  if ! [ -f %{_libdir}/libOpenCl.so.1 ] ; then
-      "%{_sbindir}/update-alternatives" --auto libOpenCL.so.1
-  fi
-fi
-%endif
-
 %check
 %make_build check
 
 %files -n libOpenCL1
 %doc README
-%if (0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550)
-%dir %{_libdir}/ocl-icd
-%{_libdir}/ocl-icd/libOpenCL.so.1*
-%ghost %{_libdir}/libOpenCL.so.1
-%ghost %{_sysconfdir}/alternatives/libOpenCL.so.1
-%else
 %{_libdir}/libOpenCL.so.1*
-%endif
 
 %files devel
 %doc README NEWS