From 736441ccfaa58eb43a4d19d5b07a9e6e24163ee0 Mon Sep 17 00:00:00 2001 From: John Thacker Date: Thu, 6 Jan 2022 22:17:26 -0500 Subject: [PATCH] packaging: Add RPM build dependencies for ninja, asciidoctor If we're building with ninja, we need to require it. While CentOS/RHEL/Rocky 8 doesn't have a asciidoctor package (so we install it separately), we can add a BuildRequires on the file that RubyGems creates for other rpm based distributions. --- packaging/rpm/wireshark.spec.in | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in index e652504cf6..9aba64b7c2 100644 --- a/packaging/rpm/wireshark.spec.in +++ b/packaging/rpm/wireshark.spec.in @@ -58,13 +58,25 @@ BuildRequires: python3 BuildRequires: gcc BuildRequires: perl BuildRequires: flex +%if %{with ninja} +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: ninja-build +%else +BuildRequires: ninja +%endif +%endif # XXX We always require Asciidoctor for packaging builds as of 84ab55cf75, -# unfortunately it's not evently distributed across distros. -# CentOS 7: rubygem-asciidoctor +# unfortunately it's not evenly distributed across distros. +# Fedora & CentOS 7: rubygem-asciidoctor # CentOS 8: -# Fedora: rubygem-asciidoctor -# openSUSE 15.2: ruby2.5-rubygem-asciidoctor -# BuildRequires: asciidoctor +# openSUSE 15.3: ruby2.5-rubygem-asciidoctor +# SLES 12 SP5: ruby2.1-rubygem-asciidoctor +# All of the packages provide this, so we can rely on it: +%if ! 0%{?el8} +BuildRequires: /usr/bin/asciidoctor +%endif +# No CentOS 8 package, so we install it from rubygems directly, but that +# means the package manager doesn't know about it and we can't require it. BuildRequires: glib2-devel >= 2.38.0 BuildRequires: libpcap-devel