From 6214efb1c95de00874fb848beb52a1575fb62053a10297205ea880280d360dca Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 24 Jan 2023 23:56:19 +0000
Subject: [PATCH] - added conflicts to nvidia-driver-G06-kmp package
 (boo#1207495)

OBS-URL: https://build.opensuse.org/package/show/X11:Drivers:Video:Redesign/nvidia-open-driver-G06-signed?expand=0&rev=14
---
 nvidia-open-driver-G06-signed.changes | 5 +++++
 nvidia-open-driver-G06-signed.spec    | 9 +++++----
 preamble                              | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/nvidia-open-driver-G06-signed.changes b/nvidia-open-driver-G06-signed.changes
index 83549ce..58c0f38 100644
--- a/nvidia-open-driver-G06-signed.changes
+++ b/nvidia-open-driver-G06-signed.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 24 23:52:53 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- added conflicts to nvidia-driver-G06-kmp package (boo#1207495)
+
 -------------------------------------------------------------------
 Thu Jan 19 19:51:20 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/nvidia-open-driver-G06-signed.spec b/nvidia-open-driver-G06-signed.spec
index 45aa47f..5d4bf36 100644
--- a/nvidia-open-driver-G06-signed.spec
+++ b/nvidia-open-driver-G06-signed.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package nvidia-Open-gfxG06
+# spec file for package nvidia-open-driver-G06-signed
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 %if %{undefined kernel_module_directory}
 %if 0%{?usrmerged}
 %define kernel_module_directory /usr/lib/modules
@@ -32,7 +33,7 @@ Name:           nvidia-open-driver-G06-signed
 Version:        525.85.05
 Release:        0
 Summary:        NVIDIA open kernel module driver for GeForce RTX 2000 series and newer
-License:        GPL-2.0 and MIT
+License:        GPL-2.0-only AND MIT
 Group:          System/Kernel
 URL:            https://github.com/NVIDIA/open-gpu-kernel-modules/
 Source0:        open-gpu-kernel-modules-%{version}.tar.gz
@@ -56,7 +57,7 @@ BuildRequires:  perl-Bootloader
 BuildRequires:  pesign-obs-integration
 BuildRequires:  zstd
 %ifnarch aarch64
-%if 0%{?sle_version} >= 120400 && !0%{?is_opensuse} 
+%if 0%{?sle_version} >= 120400 && !0%{?is_opensuse}
 BuildRequires:  kernel-syms-azure
 %endif
 %endif
diff --git a/preamble b/preamble
index 81a29c6..cd4dabc 100644
--- a/preamble
+++ b/preamble
@@ -1,4 +1,4 @@
 Requires: kernel-firmware-nvidia-gsp-G06 = %{-v*}
 Requires: perl-Bootloader
-Conflicts: nvidia-gfxG06-kmp nvidia-open-driver-G06-kmp
+Conflicts: nvidia-gfxG06-kmp nvidia-driver-G06-kmp nvidia-open-driver-G06-kmp
 Requires: group(video)