From 897f96bd725e77b705bf9804362476517e9d5c01c747cdcff4c9c6929f22ab74 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 25 Jan 2024 14:07:27 +0000
Subject: [PATCH] - switched from 60-nvidia-$flavor.conf to
 61-nvidia-$flavor.conf in   modprobe.d to resolve conflict with older
 package, which can be   installed in parallel

OBS-URL: https://build.opensuse.org/package/show/X11:Drivers:Video:Redesign/nvidia-open-driver-G06-signed?expand=0&rev=75
---
 kmp-filelist                          |  8 ++++----
 nvidia-open-driver-G06-signed.changes |  7 +++++++
 nvidia-open-driver-G06-signed.spec    | 10 +++++-----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/kmp-filelist b/kmp-filelist
index e753b01..9bd643d 100644
--- a/kmp-filelist
+++ b/kmp-filelist
@@ -4,13 +4,13 @@
 %{kernel_module_directory}/%2-%1/updates/nvidia*.ko
 %if 0%{?suse_version} >= 1550
 %dir /usr/lib/modprobe.d
-%config /usr/lib/modprobe.d/60-nvidia-%1.conf
+%config /usr/lib/modprobe.d/61-nvidia-%1.conf
 %dir /usr/lib/dracut
 %dir /usr/lib/dracut/dracut.conf.d
-/usr/lib/dracut/dracut.conf.d/60-nvidia-%1.conf
+/usr/lib/dracut/dracut.conf.d/61-nvidia-%1.conf
 %else
 %dir %{_sysconfdir}/modprobe.d
-%config %{_sysconfdir}/modprobe.d/60-nvidia-%1.conf
+%config %{_sysconfdir}/modprobe.d/61-nvidia-%1.conf
 %dir /etc/dracut.conf.d
-/etc/dracut.conf.d/60-nvidia-%1.conf
+/etc/dracut.conf.d/61-nvidia-%1.conf
 %endif
diff --git a/nvidia-open-driver-G06-signed.changes b/nvidia-open-driver-G06-signed.changes
index 6df3a79..ec18f02 100644
--- a/nvidia-open-driver-G06-signed.changes
+++ b/nvidia-open-driver-G06-signed.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan 25 13:52:41 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
+
+- switched from 60-nvidia-$flavor.conf to 61-nvidia-$flavor.conf in
+  modprobe.d to resolve conflict with older package, which can be
+  installed in parallel
+
 -------------------------------------------------------------------
 Wed Jan 24 13:39:39 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/nvidia-open-driver-G06-signed.spec b/nvidia-open-driver-G06-signed.spec
index f2722da..aff9a1f 100644
--- a/nvidia-open-driver-G06-signed.spec
+++ b/nvidia-open-driver-G06-signed.spec
@@ -158,21 +158,21 @@ MODPROBE_DIR=%{buildroot}%{_sysconfdir}/modprobe.d
 
 mkdir -p $MODPROBE_DIR
 for flavor in %flavors_to_build; do
-    cat > $MODPROBE_DIR/60-nvidia-$flavor.conf << EOF
+    cat > $MODPROBE_DIR/61-nvidia-$flavor.conf << EOF
 blacklist nouveau
 options nvidia-drm modeset=1 fbdev=1
 EOF
-    echo -n "install nvidia " >> $MODPROBE_DIR/60-nvidia-$flavor.conf
-    tail -n +3 %_sourcedir/modprobe.nvidia.install | awk '{ printf "%s ", $0 }' >> $MODPROBE_DIR/60-nvidia-$flavor.conf
+    echo -n "install nvidia " >> $MODPROBE_DIR/61-nvidia-$flavor.conf
+    tail -n +3 %_sourcedir/modprobe.nvidia.install | awk '{ printf "%s ", $0 }' >> $MODPROBE_DIR/61-nvidia-$flavor.conf
 # otherwise nvidia-uvm is missing in initrd and won't get loaded when nvidia
 # module is loaded in initrd; so better let's load all the nvidia modules
 # later ...
 %if 0%{?suse_version} >= 1550
   mkdir -p %{buildroot}/usr/lib/dracut/dracut.conf.d
-  cat  >   %{buildroot}/usr/lib/dracut/dracut.conf.d/60-nvidia-$flavor.conf << EOF
+  cat  >   %{buildroot}/usr/lib/dracut/dracut.conf.d/61-nvidia-$flavor.conf << EOF
 %else
   mkdir -p %{buildroot}/etc/dracut.conf.d
-  cat  > %{buildroot}/etc/dracut.conf.d/60-nvidia-$flavor.conf << EOF
+  cat  > %{buildroot}/etc/dracut.conf.d/61-nvidia-$flavor.conf << EOF
 %endif
 omit_drivers+=" nvidia nvidia-drm nvidia-modeset nvidia-uvm "
 EOF