From 141b610fa09251fb198e660ab74f0d004a2fd5775b6e3ec5dae8263c3baeee71 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 24 Jul 2023 17:37:45 +0000 Subject: [PATCH] Accepting request 1100424 from home:lnussel:usrmerge - Replace transitional %usrmerged macro with regular version check (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1100424 OBS-URL: https://build.opensuse.org/package/show/X11:Drivers:Video:Redesign/nvidia-open-driver-G06-signed?expand=0&rev=40 --- nvidia-open-driver-G06-signed.changes | 5 +++++ nvidia-open-driver-G06-signed.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nvidia-open-driver-G06-signed.changes b/nvidia-open-driver-G06-signed.changes index c6794e7..39446fd 100644 --- a/nvidia-open-driver-G06-signed.changes +++ b/nvidia-open-driver-G06-signed.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 24 15:37:51 UTC 2023 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Wed Jul 19 13:41:49 UTC 2023 - Stefan Dirsch diff --git a/nvidia-open-driver-G06-signed.spec b/nvidia-open-driver-G06-signed.spec index 143f93d..789eb91 100644 --- a/nvidia-open-driver-G06-signed.spec +++ b/nvidia-open-driver-G06-signed.spec @@ -19,7 +19,7 @@ %define hardcode_pci_list 0 %if %{undefined kernel_module_directory} -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 %define kernel_module_directory /usr/lib/modules %else %define kernel_module_directory /lib/modules