Fix internal Conflicts and add plasma-lookandfeel-fedora Provides

copr-build.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-COPR="andersrh/sonicDE"
+COPR="@SonicDE/SonicDE-EL10"
 GIT_URL="https://pc-rytteren.dk/forge/anders/SonicDE-rpmspecs.git"
-BRANCH="10_2"
+BRANCH="master"
 METHOD="rpkg"
 
 # Build order tiers (sequential within tier for dependency safety)

sonic-workspace/sonic-workspace.spec

@@ -7,7 +7,7 @@
 Name:    sonic-workspace
 Summary: Plasma workspace, applications and applets
 Version: 6.6.4
-Release: 11%{?dist}
+Release: 13%{?dist}
 
 # Automatically converted from old format: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LGPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT - review is highly recommended.
 License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LGPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT
@@ -285,7 +285,7 @@ BuildRequires: pkgconfig(iso-codes)
 Requires: iso-codes
 
 # Split of Xorg session into subpackage
-Obsoletes: plasma-workspace <= %{plasma_version}
+Obsoletes: plasma-workspace < %{version}-%{release}
 
 # khotkeys was dropped
 Obsoletes: khotkeys < 6
@@ -306,13 +306,16 @@ Conflicts:  plasma-workspace-x11
 Conflicts:  plasma-workspace
 Provides:   sonic-workspace = %{version}-%{release}
 Provides:   sonic-workspace%{?_isa} = %{version}-%{release}
+Provides:   plasma-workspace = %{version}-%{release}
+Provides:   plasma-workspace%{?_isa} = %{version}-%{release}
 
 %description
 Plasma 6 libraries and runtime components
 
 %package common
 Summary: Common files for %{name}
-Conflicts:  plasma-workspace-x11-common
+Provides:   plasma-workspace-common = %{version}-%{release}
+Obsoletes:  plasma-workspace-common < %{version}-%{release}
 %description common
 %{name}.
 
@@ -321,6 +324,8 @@ Summary: Runtime libkworkspace6 library
 # when spilt occurred
 Obsoletes: plasma-workspace < 5.4.2-2
 Obsoletes: libkworkspace5 < %{version}-%{release}
+Provides:  libkworkspace6 = %{version}-%{release}
+Provides:  libkworkspace6%{?_isa} = %{version}-%{release}
 Requires:  %{name}-common = %{version}-%{release}
 %description -n libkworkspace6
 %{summary}.
@@ -335,8 +340,8 @@ Obsoletes: plasma-workspace < 5.4.2-2
 Requires:  %{name}-common = %{version}-%{release}
 # consider splitting out plasma_packagestructure content later
 Provides: plasma-packagestructure = %{version}-%{release}
-Conflicts:  plasma-workspace-x11-libs
+Provides: plasma-workspace-libs = %{version}-%{release}
-Conflicts:  plasma-workspace-libs
+Provides: plasma-workspace-libs%{?_isa} = %{version}-%{release}
 Obsoletes:  plasma-workspace-libs < %{version}-%{release}
 %description libs
 %{summary}.
@@ -345,7 +350,8 @@ Obsoletes:  plasma-workspace-libs < %{version}-%{release}
 Summary:        Development files for %{name}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       libkworkspace6%{?_isa} = %{version}-%{release}
-Conflicts:  plasma-workspace-x11-devel
+Provides:       plasma-workspace-devel = %{version}-%{release}
+Provides:       plasma-workspace-devel%{?_isa} = %{version}-%{release}
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -356,7 +362,6 @@ Summary:        Documentation and user manuals for %{name}
 License:        LicenseRef-Callaway-GFDL
 # switch to noarch
 Obsoletes:      plasma-workspace-doc < 5.3.1-2
-Conflicts:  plasma-workspace-x11-doc
 Requires:       %{name}-common = %{version}-%{release}
 BuildArch: noarch
 %description    doc
@@ -397,8 +402,9 @@ Summary:  Fedora look-and-feel for Plasma
 Requires: %{name} = %{version}-%{release}
 # lockscreen look-and-feel imports qml: QtQuick.VirtualKeyboard
 Requires: qt6-qtvirtualkeyboard
+Provides: plasma-lookandfeel-fedora = %{version}-%{release}
 # when switched to noarch
-Obsoletes: plasma-lookandfeel-fedora < 5.8.0-5
+Obsoletes: plasma-lookandfeel-fedora < %{version}-%{release}
 # https://bugzilla.redhat.com/show_bug.cgi?id=1356890
 Obsoletes: f22-kde-theme < 22.4
 Obsoletes: f23-kde-theme < 23.1