From c1944095d06e044d4a5417d3168f88854526ff9f Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Mon, 18 Oct 2021 14:37:27 +0200 Subject: [PATCH] spec: dnf-json conflicts with old composer dnf-json provides files that osbuild-composer used to provide, so they should be marked as conflicting. Signed-off-by: Achilleas Koutsou --- osbuild-composer.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/osbuild-composer.spec b/osbuild-composer.spec index a2bb41ff1..069c23477 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -361,6 +361,10 @@ systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service" %package dnf-json Summary: The dnf-json binary used by osbuild-composer and the workers +# Conflicts with older versions of composer that provide the same files +# this can be removed when RHEL 8 and Fedora 35 reach EOL +Conflicts: osbuild-composer <= 35 + %description dnf-json The dnf-json binary used by osbuild-composer and the workers.