From 732d057cbd966fa21fd3908c54a177813a279d77 Mon Sep 17 00:00:00 2001
From: Michal Domonkos <mdomonko@redhat.com>
Date: Tue, 7 Nov 2023 16:40:36 +0100
Subject: [PATCH] Adapt Dockerfile.fedora to F39

The fedora-repos-modular package is gone from F39.  This commit makes
the Dockerfile work on a F39 host with the mktree.oci backend since we
override the release with "podman build --from fedora:39 ..." there.
---
 tests/Dockerfile.fedora | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/Dockerfile.fedora b/tests/Dockerfile.fedora
index febfe48539..983fa97ad2 100644
--- a/tests/Dockerfile.fedora
+++ b/tests/Dockerfile.fedora
@@ -2,7 +2,8 @@ FROM registry.fedoraproject.org/fedora:38 AS base
 MAINTAINER rpm-maint@lists.rpm.org
 
 RUN echo -e "deltarpm=0\ninstall_weak_deps=0\ntsflags=nodocs" >> /etc/dnf/dnf.conf
-RUN rpm -e fedora-repos-modular
+# Fedora 39 doesn't have this package
+RUN rpm --quiet -q fedora-repos-modular && rpm -e fedora-repos-modular ||:
 RUN sed -i -e "s:^enabled=.$:enabled=0:g" /etc/yum.repos.d/*openh264.repo
 # dummy for controlling per-repo gpgcheck via Semaphore setup
 RUN sed -i -e "s:^gpgcheck=.$:gpgcheck=1:g" /etc/yum.repos.d/*.repo