Add EPEL apps at latest versions and fix all EPEL dependency conflicts
Some checks failed
Build RPMs / build (push) Has been cancelled
Some checks failed
Build RPMs / build (push) Has been cancelled
Add 8 new packages built from upstream KDE sources at versions matching the rest of SonicDE (Gear 26.04.3, Plasma 6.7.4): - colord-kde 26.04.3 - dolphin-plugins 26.04.3 - filelight 26.04.3 - kde-gtk-config 6.7.4 - kde-inotify-survey 26.04.3 - ksanecore 26.04.3 (dependency for skanpage) - plasma-discover 6.7.4 (with snap backend disabled) - skanpage 26.04.3 These packages replace the EPEL versions and use SonicDE dependencies instead of kf6-*/plasma-* packages, ensuring they are upgraded (not removed) when SonicDE is installed alongside EPEL KDE. Fix EPEL dependencies in existing SonicDE packages that caused packages to be removed during dnf upgrade --allowerasing: - sonic-desktop-interface: kde-cli-tools -> sonic-terminal-tools, kmenuedit -> sonic-launcher-menu-edit, kwrited -> sonic-write-daemon, signon-plugin-oauth2 and plasma-systemsettings changed to Recommends - sonic-workspace: kio-fuse -> sonic-frameworks-io-fuse, polkit-kde -> sonic-polkit-agent, xdg-desktop-portal-kde -> xdg-desktop-portal-sonicde, plasma-keyboard and kde-settings-plasma changed to Recommends - sonic-workspace-addons: kf6-plasma -> sonic-interface-libraries - kde-gtk-config: breeze-gtk-common -> sonic-silver-gtk-common - sonic-login-manager: kde-settings-plasma changed to Recommends - kcm-soniclogin: plasma-systemsettings changed to Recommends - sonic-rpm-macros: kde-qdoc-common changed to Recommends - sonic-welcome-center: add Obsoletes for plasma-welcome Also includes Obsoletes/Provides fixes across all spec files for proper EPEL package replacement, and Conflicts tag removal from spec files. Result: dnf upgrade --allowerasing from standard EPEL KDE removes 0 packages. dnf install of SonicDE packages installs 195 packages with 0 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:
parent
a5fbbaa9c3
commit
a88703e93e
153 changed files with 6147 additions and 988 deletions
|
|
@ -19,7 +19,7 @@ ExcludeArch: %{ix86}
|
|||
#Name: plasma-firewall
|
||||
Name: sonic-firewall
|
||||
Version: 6.7.4
|
||||
Release: 1%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Control Panel for your system firewall
|
||||
|
||||
License: BSD-3-Clause AND CC0-1.0 AND FSFAP AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)
|
||||
|
|
@ -52,8 +52,8 @@ Requires: sonic-frameworks-settings-utils%{?_isa}
|
|||
Requires: %{name}-backend = %{version}-%{release}
|
||||
Suggests: %{name}-firewalld
|
||||
|
||||
Provides: plasma-firewall = %{version}-%{release}
|
||||
Conflicts: plasma-firewall < %{version}-%{release}
|
||||
Provides: plasma-firewall%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: plasma-firewall < %{version}-%{release}
|
||||
|
||||
%description
|
||||
%{summary}.
|
||||
|
|
@ -65,8 +65,8 @@ Provides: %{name}-backend = %{version}-%{release}
|
|||
Conflicts: %{name}-backend
|
||||
Requires: firewalld
|
||||
|
||||
Provides: plasma-firewall-firewalld = %{version}-%{release}
|
||||
Conflicts: plasma-firewall-firewalld < %{version}-%{release}
|
||||
Provides: plasma-firewall-firewalld%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: plasma-firewall-firewalld < %{version}-%{release}
|
||||
|
||||
%description firewalld
|
||||
This package provides the backend code for Plasma Firewall
|
||||
|
|
@ -84,8 +84,8 @@ Requires: dbus-common
|
|||
# For polkit directories
|
||||
Requires: polkit
|
||||
|
||||
Provides: plasma-firewall-ufw = %{version}-%{release}
|
||||
Conflicts: plasma-firewall-ufw < %{version}-%{release}
|
||||
Provides: plasma-firewall-ufw%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: plasma-firewall-ufw < %{version}-%{release}
|
||||
|
||||
%description ufw
|
||||
This package provides the backend code for Plasma Firewall
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue