diff options
| author | Gerald Combs <gerald@wireshark.org> | 2020-10-27 10:09:40 -0700 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2020-10-28 20:48:49 +0000 |
| commit | 05bd5cd91eeee9004efc6ea82d62cad831cda05f (patch) | |
| tree | 6d22373e02adb5ff86548ffce906a5a6c59ff94d /packaging | |
| parent | b1d18e41db5e3b3b5b8b95b405c7dbce5ba14e18 (diff) | |
CI+RPM: Disable the Fedora build for now.
Fedora 33's RPM environent added changes that break CMake. Disable it
for now.
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/rpm/wireshark.spec.in | 6 |
1 files changed, 6 insertions, 0 deletions
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 |