From 86940cb8c4404aabae303ac85518c7e9517f68fc5a19947c0bc6428c4aff637f Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 8 Mar 2023 07:58:58 +0000 Subject: [PATCH] Accepting request 1070094 from home:eeich:branches:network:cluster - Fix conflicts for plugin-ext-sensors-rrd OBS-URL: https://build.opensuse.org/request/show/1070094 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=240 --- slurm.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/slurm.spec b/slurm.spec index 8b41912..00dafc4 100644 --- a/slurm.spec +++ b/slurm.spec @@ -407,11 +407,10 @@ This package contains the SLURM plugins (loadable shared objects) %package plugin-ext-sensors-rrd Summary: SLURM ext_sensors/rrd Plugin (loadable shared objects) Group: Productivity/Clustering/Computing -%{?upgrade:Provides: %{pname}-plugin-ext-sensors-rrd = %{version}} -%{?upgrade:Conflicts: %{pname}-plugin-ext-sensors-rrd} -Conflicts: %{pname}-plugins -Obsoletes: %{pname}-plugins < %{version} Requires: %{name}-plugins = %{version} +%{?upgrade:Provides: %{pname}-plugin-ext-sensors-rrd = %{version}} +%{?upgrade:Obsoletes: %{pname}-plugins < %{version}} +%{?upgrade:Conflicts: %{pname}-plugin-ext-sensors-rrd} %description plugin-ext-sensors-rrd This package contains the ext_sensors/rrd plugin used to read data