From a5fbbaa9c3d75b1f993eb280bf6d6d7704a25822 Mon Sep 17 00:00:00 2001 From: test Date: Wed, 26 Aug 2026 09:52:29 +0000 Subject: [PATCH] Fix installation conflicts with EPEL packages - sonic-system-stats: Add %{?_isa} to ksystemstats Provides so sonic-workspace's ksystemstats(x86-64) requirement can be satisfied - sonic-dr-robotnik: Make python3dist(sentry-sdk) a Recommends instead of Requires since it's not available on RHEL 10 Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- sonic-dr-robotnik/sonic-dr-robotnik.spec | 4 ++-- sonic-system-stats/sonic-system-stats.spec | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sonic-dr-robotnik/sonic-dr-robotnik.spec b/sonic-dr-robotnik/sonic-dr-robotnik.spec index 666bac5..3022ffb 100644 --- a/sonic-dr-robotnik/sonic-dr-robotnik.spec +++ b/sonic-dr-robotnik/sonic-dr-robotnik.spec @@ -17,7 +17,7 @@ ExcludeArch: %{ix86} Name: sonic-dr-robotnik Summary: DrKonqi crash handler for KF6/Plasma6 Version: 6.7.4.1 -Release: 1%{?dist} +Release: 2%{?dist} 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.1-only 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) #URL: https://invent.kde.org/plasma/%%{base_name} URL: https://github.com/Sonic-DE/%{reponame} @@ -58,7 +58,7 @@ Requires: sonic-frameworks-data-models Requires: sonic-frameworks-settings-utils Requires: python3dist(psutil) Requires: python3dist(pygdbmi) -Requires: python3dist(sentry-sdk) +Recommends: python3dist(sentry-sdk) Requires: systemd-udev Requires: elfutils diff --git a/sonic-system-stats/sonic-system-stats.spec b/sonic-system-stats/sonic-system-stats.spec index 18eae58..1412636 100644 --- a/sonic-system-stats/sonic-system-stats.spec +++ b/sonic-system-stats/sonic-system-stats.spec @@ -10,7 +10,7 @@ #Name: ksystemstats Name: sonic-system-stats Version: 6.7.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KSystemStats is a daemon that collects statistics about the running system. License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) @@ -49,7 +49,7 @@ BuildRequires: systemd-devel BuildRequires: pkgconfig(libpcap) BuildRequires: libdrm-devel -Provides: ksystemstats = %{version}-%{release} +Provides: ksystemstats%{?_isa} = %{version}-%{release} Conflicts: ksystemstats < %{version}-%{release} %description @@ -58,7 +58,7 @@ KSystemStats is a daemon that collects statistics about the running system. %package devel Summary: Developer files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Provides: ksystemstats-devel = %{version}-%{release} +Provides: ksystemstats-devel%{?_isa} = %{version}-%{release} Conflicts: ksystemstats-devel < %{version}-%{release} %description devel