From 0849efc1007af54bff64b2208b04a49548b2ae02 Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Mon, 27 Apr 2026 13:49:51 +0300 Subject: [PATCH 1/2] PMM-15015 Remove conflicting package declaration in pmm-client --- build/packages/rpm/client/pmm-client.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/build/packages/rpm/client/pmm-client.spec b/build/packages/rpm/client/pmm-client.spec index 5ddbf30c406..8b594aebd99 100644 --- a/build/packages/rpm/client/pmm-client.spec +++ b/build/packages/rpm/client/pmm-client.spec @@ -21,7 +21,6 @@ Requires(preun): systemd Requires(postun): systemd AutoReq: no -Conflicts: pmm-client Obsoletes: pmm2-client < 3.0.0 %description From 39256108ea7f958af68cc91b04c604008b20f935 Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Wed, 13 May 2026 17:04:05 +0300 Subject: [PATCH 2/2] PMM-15015 Revert the Conflict directive --- build/packages/rpm/client/pmm-client.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/build/packages/rpm/client/pmm-client.spec b/build/packages/rpm/client/pmm-client.spec index 8b594aebd99..2d31c1b2e52 100644 --- a/build/packages/rpm/client/pmm-client.spec +++ b/build/packages/rpm/client/pmm-client.spec @@ -21,6 +21,7 @@ Requires(preun): systemd Requires(postun): systemd AutoReq: no +Conflicts: pmm-client < 3.0.0 Obsoletes: pmm2-client < 3.0.0 %description