forked from osmocom/wireshark
CI+RPM: Disable the Fedora build for now.
Fedora 33's RPM environent added changes that break CMake. Disable it
for now.
(cherry picked from commit 05bd5cd91e
)
This commit is contained in:
parent
b387f0c4db
commit
de66fa058f
|
@ -99,7 +99,9 @@ test:rpm-opensuse-15.1:
|
||||||
GIT_STRATEGY: none
|
GIT_STRATEGY: none
|
||||||
dependencies:
|
dependencies:
|
||||||
- build:rpm-opensuse-15.1
|
- build:rpm-opensuse-15.1
|
||||||
build:rpm-fedora:
|
|
||||||
|
# Disabled for now due to issues with Fedora 33.
|
||||||
|
.build:rpm-fedora:
|
||||||
<<: *build-rpm
|
<<: *build-rpm
|
||||||
image: fedora
|
image: fedora
|
||||||
script:
|
script:
|
||||||
|
@ -109,7 +111,8 @@ build:rpm-fedora:
|
||||||
- cd build
|
- cd build
|
||||||
- cmake3 -GNinja ..
|
- cmake3 -GNinja ..
|
||||||
- ninja-build rpm-package
|
- ninja-build rpm-package
|
||||||
test:rpm-fedora:
|
|
||||||
|
.test:rpm-fedora:
|
||||||
image: fedora
|
image: fedora
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
|
|
|
@ -226,6 +226,7 @@ Wireshark. A Qt graphical user interface is packaged separately.
|
||||||
%package qt
|
%package qt
|
||||||
Summary: Wireshark's Qt-based GUI
|
Summary: Wireshark's Qt-based GUI
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
|
# XXX Fedora 33 requires versioned "Obsoletes" declarations.
|
||||||
Obsoletes: wireshark-gnome wireshark-gtk
|
Obsoletes: wireshark-gnome wireshark-gtk
|
||||||
%description qt
|
%description qt
|
||||||
This package contains the Qt Wireshark GUI and desktop integration files.
|
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
|
%define _bindir /usr/bin
|
||||||
%endif
|
%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}
|
%if 0%{?rhel}
|
||||||
cmake3 \
|
cmake3 \
|
||||||
%else
|
%else
|
||||||
|
|
Loading…
Reference in New Issue