Fix zypper conflict about directory -> symlink workaround (bsc#1244458)

kernel-firmware-nvidia.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jun 12 07:05:23 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Fix zypper conflict about directory -> symlink workaround (bsc#1244458)
+
+-------------------------------------------------------------------
+Thu Jun  5 10:45:00 UTC 2025 - Takashi Iwai <tiwai@suse.com>
+
+- Add workaround for directory/symlink changes (bsc#1243843)
+
 -------------------------------------------------------------------
 Mon May 19 19:09:24 UTC 2025 - Takashi Iwai <tiwai@suse.com>
 

kernel-firmware-nvidia.spec

@@ -30,10 +30,11 @@ License:        GPL-2.0-or-later AND SUSE-Firmware
 Group:          System/Kernel
 URL:            https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
 Source0:        %{name}-%{version}.tar.xz
-Source1:        https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250425.tar.gz#/kernel-firmware-tools-20250425.tar.gz
+Source1:        https://github.com/openSUSE/kernel-firmware-tools/archive/refs/tags/20250605.tar.gz#/kernel-firmware-tools-20250605.tar.gz
 Source2:        %{name}-rpmlintrc
 Source3:        git_id
 Source10:       aliases
+Source11:       post
 BuildRequires:  suse-module-tools
 Requires(post): %{_bindir}/mkdir
 Requires(post): %{_bindir}/touch
@@ -168,14 +169,28 @@ scripts/install-licenses.sh nvidia %{buildroot}%{_licensedir}/%{name}
 install -c -D -m 0644 WHENCE %{buildroot}%{_licensedir}/%{name}/WHENCE
 install -c -D -m 0644 README.md %{buildroot}%{_docdir}/%{name}/README.md
 
-%post
-%{?regenerate_initrd_post}
-
-%postun
-%{?regenerate_initrd_post}
-
-%posttrans
-%{?regenerate_initrd_posttrans}
+%pretrans -p <lua>
+if not macros then
+  fwdir = "/lib/firmware"
+else
+  fwdir = macros._firmwaredir
+end
+paths = {"ad103", "ad104", "ad106", "ad107"}
+for i = 1, 4 do
+  path = fwdir .. "/nvidia/" .. paths[i]
+  st = posix.stat(path)
+  if st and st.type == "directory" then
+    status = os.rename(path, path .. ".rpmmoved")
+    if not status then
+      suffix = 0
+      while not status do
+        suffix = suffix + 1
+        status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
+      end
+      os.rename(path, path .. ".rpmmoved")
+    end
+  end
+end
 
 %files
 %doc %{_docdir}/%{name}

post

@@ -0,0 +1,22 @@
+%pretrans -p <lua>
+if not macros then
+  fwdir = "/lib/firmware"
+else
+  fwdir = macros._firmwaredir
+end
+paths = {"ad103", "ad104", "ad106", "ad107"}
+for i = 1, 4 do
+  path = fwdir .. "/nvidia/" .. paths[i]
+  st = posix.stat(path)
+  if st and st.type == "directory" then
+    status = os.rename(path, path .. ".rpmmoved")
+    if not status then
+      suffix = 0
+      while not status do
+        suffix = suffix + 1
+        status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
+      end
+      os.rename(path, path .. ".rpmmoved")
+    end
+  end
+end