From 05bd5cd91eeee9004efc6ea82d62cad831cda05f Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Tue, 27 Oct 2020 10:09:40 -0700
Subject: [PATCH] CI+RPM: Disable the Fedora build for now.

Fedora 33's RPM environent added changes that break CMake. Disable it
for now.
---
 .gitlab-ci.yml                  | 9 ++++++---
 packaging/rpm/wireshark.spec.in | 6 ++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b90f08d3c..95a4a1728e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -99,7 +99,9 @@ test:rpm-opensuse-15.1:
     GIT_STRATEGY: none
   dependencies:
     - build:rpm-opensuse-15.1
-build:rpm-fedora:
+
+# Disabled for now due to issues with Fedora 33.
+.build:rpm-fedora:
   <<: *build-rpm
   image: fedora
   script:
@@ -109,7 +111,8 @@ build:rpm-fedora:
     - cd build
     - cmake3 -GNinja ..
     - ninja-build rpm-package
-test:rpm-fedora:
+
+.test:rpm-fedora:
   image: fedora
   stage: test
   script:
@@ -263,7 +266,7 @@ merge-req:ubuntu-clang-other-tests:
   artifacts:
     paths:
       - cppcheck_report.xml
-      - cppcheck_report.html  
+      - cppcheck_report.html
 
 # XXX This is still beta:
 # https://docs.gitlab.com/ee/user/gitlab_com/index.html#windows-shared-runners-beta
diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in
index 6ca197818d..ad876255c8 100644
--- a/packaging/rpm/wireshark.spec.in
+++ b/packaging/rpm/wireshark.spec.in
@@ -226,6 +226,7 @@ Wireshark. A Qt graphical user interface is packaged separately.
 %package	qt
 Summary:	Wireshark's Qt-based GUI
 Group:		Applications/Internet
+# XXX Fedora 33 requires versioned "Obsoletes" declarations.
 Obsoletes:	wireshark-gnome wireshark-gtk
 %description qt
 This package contains the Qt Wireshark GUI and desktop integration files.
@@ -281,6 +282,11 @@ development of Wireshark scripts and plugins.
 %define _bindir /usr/bin
 %endif
 
+# XXX How do we reliably run CMake for all of CentOS, Fedora, RHEL, and openSUSE?
+# The percent-cmake macro in Fedora >= 33 runs
+# /usr/bin/cmake -S . -B x86_64-redhat-linux-gnu
+# which presumably means we need to use the cmake_build and cmake_install
+# macros described at https://docs.fedoraproject.org/en-US/packaging-guidelines/CMake/
 %if 0%{?rhel}
 cmake3 \
 %else