Drop support for F39 in Dockerfile

Assuming all our devs are already at least on F40 on their workstations,
just finally drop the gdb-headless workaround.  The original bug
(#2310156) was fixed in both F40 and 41.

This also simplifies the special-casing for "rpm -e" a bit.

tests/Dockerfile.fedora

@@ -1,4 +1,4 @@
-# Supported Fedora releases: 39 40 41
+# Supported Fedora releases: 40 41
 FROM registry.fedoraproject.org/fedora:40 AS base
 MAINTAINER [email protected]
 
@@ -47,12 +47,14 @@ RUN dnf -y install \
   tar unzip gzip bzip2 cpio xz p7zip \
   pkgconfig \
   /usr/bin/systemd-sysusers \
+  gdb-headless \
   dwz \
   fsverity-utils fsverity-utils-devel \
   pandoc \
   sequoia-sq \
   libasan \
-  libubsan
+  libubsan \
+  && dnf clean all
 
 RUN echo "%_dbpath $(rpm --eval '%_dbpath')" > /root/.rpmmacros
 
@@ -61,17 +63,12 @@ RUN echo "%_dbpath $(rpm --eval '%_dbpath')" > /root/.rpmmacros
 RUN ln -sf $(rpm --eval '%{_target_platform}%{?_gnu}')-pkg-config \
            /usr/bin/pkg-config
 
-# F40 and older (no dnf5) require special handling
-RUN if which dnf5; then \
-        dnf -y install gdb-headless; \
-        dnf clean all; \
-    else \
-        dnf -y install "gdb-headless < 15"; \
-        dnf clean all; \
-        rpm -e --nodeps --nodb rpm-sign-libs python3-rpm; \
-    fi
-
-RUN rpm -e --nodeps --nodb \
+# DNF < 5 pulls in additional rpm subpackages, remove those first
+RUN which dnf5 || \
+    rpm -e --nodeps --nodb \
+        rpm-sign-libs \
+        python3-rpm; \
+    rpm -e --nodeps --nodb \
 	rpm \
 	rpm-libs \
 	rpm-build-libs