Fix dnf upgrade --allowerasing errors with EPEL packages
Some checks failed
Build RPMs / build (push) Failing after 1h6m24s

Fix 4 errors that occurred when running dnf upgrade --allowerasing on a
system with EPEL KDE packages installed:

1. plasma-discover: Fix typo "sonic-desktop-interface)" -> "sonic-desktop-interface"
   in Requires (stray closing parenthesis in spec)

2. sonic-frameworks-sso: Remove Obsoletes for signon and signon-qt6.
   The SonicDE SSO package provides libsignon-qt6.so.0 while the EPEL
   signon-qt6 provides libsignon-qt6.so.1. Obsoleting signon-qt6 breaks
   accounts-qml-module-qt6 and signon-plugin-oauth2 which need .so.1.
   Both packages can coexist since they install different .so versions.

3. sonic-terminal-tools: Change kdesu dependency from strict version
   match (= 1:6.7.4-3) to >= 1:6.7.4 so it works with any kdesu 6.7.4
   release. Also add Obsoletes for kdesu < 1:6.7.4-2.el10 in the kdesu
   subpackage so it properly replaces the old EPEL kdesu from kde-cli-tools.

4. kamera: Add kamera package with Requires changed from kde-cli-tools
   to sonic-terminal-tools. The EPEL kamera requires kde-cli-tools which
   is obsoleted by sonic-terminal-tools, causing a circular dependency
   resolution failure.

5. skanpage: Change Requires from kquickimageeditor-qt6 (obsoleted by
   sonic-quick-image-editor-qt6) to sonic-quick-image-editor-qt6.

Result: dnf upgrade --allowerasing --best from standard EPEL KDE now
completes with 0 errors and 0 package removals.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
test 2026-08-27 17:49:20 +00:00
commit 2735e8fae8
6 changed files with 84 additions and 11 deletions

Binary file not shown.

76
kamera/kamera.spec Normal file
View file

@ -0,0 +1,76 @@
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
Name: kamera
Summary: Digital camera support for KDE
Version: 25.12.3
Release: 2%{?dist}
# Automatically converted from old format: GPLv2 - review is highly recommended.
License: GPL-2.0-only
URL: https://www.kde.org/applications/graphics/
Source0: kamera-%{version}.tar.xz
BuildRequires: extra-cmake-modules
BuildRequires: kf6-rpm-macros
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: cmake(Qt6Core)
BuildRequires: cmake(Qt6Core5Compat)
BuildRequires: cmake(KF6ConfigWidgets)
BuildRequires: cmake(KF6XmlGui)
BuildRequires: cmake(KF6KIO)
BuildRequires: cmake(KF6I18n)
BuildRequires: cmake(KF6Config)
BuildRequires: cmake(KF6KCMUtils)
BuildRequires: cmake(KF6DocTools)
BuildRequires: pkgconfig(libgphoto2)
Requires: sonic-terminal-tools
%description
%{summary}.
%prep
%autosetup -p1
%build
%cmake_kf6
%cmake_build
%install
%cmake_install
%find_lang %{name} --all-name --with-html
%check
desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/kcm_%{name}.desktop
appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.%{name}.metainfo.xml
%files -f %{name}.lang
%doc AUTHORS README
%license LICENSES/*.txt
%{_kf6_datadir}/applications/kcm_%{name}.desktop
%{_kf6_datadir}/solid/actions/solid_camera.desktop
%{_kf6_datadir}/qlogging-categories6/%{name}.categories
%{_kf6_qtplugindir}/plasma/kcms/systemsettings_qwidgets/kcm_%{name}.so
%{_kf6_metainfodir}/org.kde.%{name}.metainfo.xml
%{_kf6_plugindir}/kio/kio_%{name}.so
%changelog
* Thu Aug 27 2026 SonicDE <dev@sonicde.org> - 25.12.3-2
- Change Requires from kde-cli-tools to sonic-terminal-tools
* Sun Mar 08 2026 Steve Cossette <farchord@gmail.com> - 25.12.3-1
- 25.12.3

View file

@ -9,7 +9,7 @@
Name: plasma-discover
Summary: KDE and Plasma resources management GUI
Version: 6.7.4
Release: 1%{?dist}
Release: 2%{?dist}
License: 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-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)
URL: https://invent.kde.org/plasma/discover
@ -155,7 +155,7 @@ Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires: flatpak >= %{flatpak_version}
Requires: flatpak-libs%{?_isa} >= %{flatpak_version}
Requires: sonic-desktop-interface)
Requires: sonic-desktop-interface
Supplements: (%{name} and flatpak)
%description flatpak
%{summary}.

View file

@ -1,6 +1,6 @@
Name: skanpage
Version: 26.04.3
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Utility to scan images and multi-page documents
License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-3.0-only
@ -50,7 +50,7 @@ BuildRequires: cmake(Leptonica)
Requires: qt6-qtquickcontrols2
Requires: sonic-frameworks-quick-ui
Requires: kquickimageeditor-qt6
Requires: sonic-quick-image-editor-qt6
Recommends: sane-backends-drivers-scanners

View file

@ -13,7 +13,7 @@
#Name: signon
Name: sonic-frameworks-sso
Version: 8.61.2
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Accounts framework for Linux and POSIX based platforms
License: LGPL-2.1-only
@ -35,7 +35,6 @@ Provides: signond%{?_isa} = %{version}-%{release}
Requires: dbus
Provides: signon%{?_isa} = %{version}-%{release}
Obsoletes: signon < %{version}-%{release}
%description
Single Sign-On is a framework for centrally storing authentication credentials
@ -47,7 +46,6 @@ client library for applications to communicate with this system.
%package qt6
Summary: Single Sign On client library for Qt6-based applications
Provides: signon-qt6%{?_isa} = %{version}-%{release}
Obsoletes: signon-qt6 < %{version}-%{release}
%description qt6
%{summary}.
@ -59,9 +57,7 @@ Requires: %{name}-qt6%{?_isa} = %{version}-%{release}
# upstream name: signond
Provides: signond-devel%{?_isa} = %{version}-%{release}
Provides: signon-devel%{?_isa} = %{version}-%{release}
Obsoletes: signon-devel < %{version}-%{release}
Provides: signon-qt6-devel%{?_isa} = %{version}-%{release}
Obsoletes: signon-qt6-devel < %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for

View file

@ -10,7 +10,7 @@
#Name: kde-cli-tools
Name: sonic-terminal-tools
Version: 6.7.4
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Tools based on KDE Frameworks 5 to better interact with the system
@ -47,7 +47,7 @@ BuildRequires: sonic-workspace-devel >= %{version}
Requires: sonic-workspace-libs%{?_isa} >= %{version}
# upgrade path, from when this wasn't split out
Requires: kdesu = 1:%{version}-%{release}
Requires: kdesu >= 1:%{version}
# unversioned utilitized landed here in 5.23.90, see also
# https://phabricator.kde.org/T14763
@ -66,6 +66,7 @@ Summary: Runs a program with elevated privileges
Epoch: 1
Conflicts: kde-runtime < 14.12.3-2
Conflicts: kde-runtime-docs < 14.12.3-2
Obsoletes: kdesu < 1:6.7.4-2.el10
%description -n kdesu
%{summary}.