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
|
|
@ -14,7 +14,7 @@
|
|||
#Name: kaccounts-integration
|
||||
Name: sonic-accounts-integration
|
||||
Version: 26.04.3
|
||||
Release: 1%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Small system to administer web accounts across the KDE desktop
|
||||
License: 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
|
||||
#URL: https://invent.kde.org/network/%%{name}
|
||||
|
|
@ -73,8 +73,8 @@ BuildRequires: cmake(SignOnQt5)
|
|||
# For AutoReq cmake-filesystem
|
||||
BuildRequires: cmake
|
||||
|
||||
Provides: kaccounts-integration = %{version}-%{release}
|
||||
Conflicts: kaccounts-integration < %{version}-%{release}
|
||||
Provides: kaccounts-integration%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: kaccounts-integration < %{version}-%{release}
|
||||
|
||||
%description
|
||||
Small system to administer web accounts for the sites and services
|
||||
|
|
@ -90,8 +90,8 @@ Provides: sonic-accounts-integration = %{version}-%{release}
|
|||
# translations moved here
|
||||
Conflicts: kde-l10n < 17.03
|
||||
|
||||
Provides: kaccounts-integration-qt5 = %{version}-%{release}
|
||||
Conflicts: kaccounts-integration-qt5 < %{version}-%{release}
|
||||
Provides: kaccounts-integration-qt5%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: kaccounts-integration-qt5 < %{version}-%{release}
|
||||
|
||||
%description qt5
|
||||
Small system to administer web accounts for the sites and services
|
||||
|
|
@ -107,10 +107,10 @@ Requires: cmake(SignOnQt5)
|
|||
Requires: pkgconfig(libaccounts-glib)
|
||||
Requires: intltool
|
||||
Obsoletes: kaccounts-integration-devel < 24.01.75
|
||||
Provides: kaccounts-integration-devel = %{version}-%{release}
|
||||
Provides: kaccounts-integration-devel%{?_isa} = %{version}-%{release}
|
||||
|
||||
Provides: kaccounts-integration-qt5-devel = %{version}-%{release}
|
||||
Conflicts: kaccounts-integration-qt5-devel < %{version}-%{release}
|
||||
Provides: kaccounts-integration-qt5-devel%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: kaccounts-integration-qt5-devel < %{version}-%{release}
|
||||
|
||||
%description qt5-devel
|
||||
Headers, development libraries and documentation for %{name}.
|
||||
|
|
@ -119,8 +119,8 @@ Headers, development libraries and documentation for %{name}.
|
|||
%package qt6
|
||||
Summary: qt6 runtime for %{name}
|
||||
|
||||
Provides: kaccounts-integration-qt6 = %{version}-%{release}
|
||||
Conflicts: kaccounts-integration-qt6 < %{version}-%{release}
|
||||
Provides: kaccounts-integration-qt6%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: kaccounts-integration-qt6 < %{version}-%{release}
|
||||
|
||||
%description qt6
|
||||
Small system to administer web accounts for the sites and services
|
||||
|
|
@ -136,8 +136,8 @@ Requires: cmake(SignOnQt6)
|
|||
Requires: pkgconfig(libaccounts-glib)
|
||||
Requires: intltool
|
||||
|
||||
Provides: kaccounts-integration-qt6-devel = %{version}-%{release}
|
||||
Conflicts: kaccounts-integration-qt6-devel < %{version}-%{release}
|
||||
Provides: kaccounts-integration-qt6-devel%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: kaccounts-integration-qt6-devel < %{version}-%{release}
|
||||
|
||||
%description qt6-devel
|
||||
Headers, development libraries and documentation for %{name}.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue