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
|
|
@ -12,7 +12,7 @@
|
|||
#Name: kf6-%%{framework}
|
||||
Name: sonic-frameworks-root-shell
|
||||
Version: 6.29.0
|
||||
Release: 1%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: KDE Frameworks 6 Tier 3 integration with su
|
||||
|
||||
License: CC0-1.0 AND GPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND (LGPL-2.1-only OR LGPL-3.0-only)
|
||||
|
|
@ -39,8 +39,8 @@ Requires: kf6-filesystem
|
|||
Requires: sudo
|
||||
%endif
|
||||
|
||||
Provides: kf6-kdesu = %{version}-%{release}
|
||||
Conflicts: kf6-kdesu < %{version}-%{release}
|
||||
Provides: kf6-kdesu%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: kf6-kdesu < %{version}-%{release}
|
||||
|
||||
%description
|
||||
|
||||
|
|
@ -48,8 +48,8 @@ Conflicts: kf6-kdesu < %{version}-%{release}
|
|||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: cmake(KF6Pty)
|
||||
Provides: kf6-kdesu-devel = %{version}-%{release}
|
||||
Conflicts: kf6-kdesu-devel < %{version}-%{release}
|
||||
Provides: kf6-kdesu-devel%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: kf6-kdesu-devel < %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
|
|
@ -58,8 +58,8 @@ developing applications that use %{name}.
|
|||
%package doc
|
||||
Summary: Developer Documentation files for %{name}
|
||||
BuildArch: noarch
|
||||
Provides: kf6-kdesu-doc = %{version}-%{release}
|
||||
Conflicts: kf6-kdesu-doc < %{version}-%{release}
|
||||
Provides: kf6-kdesu-doc%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: kf6-kdesu-doc < %{version}-%{release}
|
||||
|
||||
%description doc
|
||||
Developer Documentation files for %{name} for use with KDevelop or QtCreator.
|
||||
|
|
@ -67,8 +67,8 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.
|
|||
%package html
|
||||
Summary: Developer Documentation files for %{name}
|
||||
BuildArch: noarch
|
||||
Provides: kf6-kdesu-html = %{version}-%{release}
|
||||
Conflicts: kf6-kdesu-html < %{version}-%{release}
|
||||
Provides: kf6-kdesu-html%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: kf6-kdesu-html < %{version}-%{release}
|
||||
|
||||
%description html
|
||||
Developer Documentation files for %{name} in HTML format
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue