forked from osmocom/wireshark
packaging: EPEL 8 has asciidoctor now
rubygems-asciidoctor was released 2022-05-18 for EPEL 8 ( https://bugzilla.redhat.com/show_bug.cgi?id=1820896 ) so we don't need to special case it for RHEL/Centos 8.
This commit is contained in:
parent
65e13f9d8f
commit
32326b3a07
|
@ -80,18 +80,14 @@ BuildRequires: ninja-build
|
||||||
BuildRequires: ninja
|
BuildRequires: ninja
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
# XXX We always require Asciidoctor for packaging builds as of 84ab55cf75,
|
# We always require Asciidoctor for packaging builds as of 84ab55cf75,
|
||||||
# unfortunately it's not evenly distributed across distros.
|
# unfortunately it's not evenly distributed across distros.
|
||||||
# Fedora & CentOS 7: rubygem-asciidoctor
|
# Fedora & CentOS: rubygem-asciidoctor
|
||||||
# CentOS 8: <no package? - https://bugzilla.redhat.com/show_bug.cgi?id=1820896>
|
# CentOS 8: <added in - https://bugzilla.redhat.com/show_bug.cgi?id=1820896>
|
||||||
# openSUSE 15.3: ruby2.5-rubygem-asciidoctor
|
# openSUSE 15.3: ruby2.5-rubygem-asciidoctor
|
||||||
# SLES 12 SP5: ruby2.1-rubygem-asciidoctor
|
# SLES 12 SP5: ruby2.1-rubygem-asciidoctor
|
||||||
# All of the packages provide this, so we can rely on it:
|
# All of the packages provide this, so we can rely on it:
|
||||||
%if ! 0%{?el8}
|
|
||||||
BuildRequires: /usr/bin/asciidoctor
|
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.
|
|
||||||
|
|
||||||
# For the HTML guides, we need xsltproc, and the docbook stylesheets
|
# For the HTML guides, we need xsltproc, and the docbook stylesheets
|
||||||
%if %{with guides}
|
%if %{with guides}
|
||||||
|
|
|
@ -191,12 +191,11 @@ echo "Required OpenSUSE packages hicolor-icon-theme and xdg-utils are unavailabl
|
||||||
add_package BASIC_LIST update-desktop-files ||
|
add_package BASIC_LIST update-desktop-files ||
|
||||||
echo "Required OpenSUSE package update-desktop-files is unavailable. Not required for other distributions." >&2
|
echo "Required OpenSUSE package update-desktop-files is unavailable. Not required for other distributions." >&2
|
||||||
|
|
||||||
# rubygem-asciidoctor.noarch: Centos 7, Fedora
|
# rubygem-asciidoctor.noarch: Centos, Fedora
|
||||||
|
# (Added to RHEL/Centos 8: https://bugzilla.redhat.com/show_bug.cgi?id=1820896 )
|
||||||
# ruby2.5-rubygem-asciidoctor: openSUSE 15.2
|
# ruby2.5-rubygem-asciidoctor: openSUSE 15.2
|
||||||
# You will get nothing and you will like it: CentOS 8
|
|
||||||
add_package RPMDEPS_LIST rubygem-asciidoctor.noarch || add_package RPMDEPS_LIST ruby2.5-rubygem-asciidoctor ||
|
add_package RPMDEPS_LIST rubygem-asciidoctor.noarch || add_package RPMDEPS_LIST ruby2.5-rubygem-asciidoctor ||
|
||||||
echo "RPM dependency asciidoctor is unavailable. Not available for CentOS 8" >&2
|
echo "RPM dependency asciidoctor is unavailable" >&2
|
||||||
|
|
||||||
|
|
||||||
# libcap: CentOS 7, Fedora 28, Fedora 29
|
# libcap: CentOS 7, Fedora 28, Fedora 29
|
||||||
# libcap2: OpenSUSE Leap 42.3, OpenSUSE Leap 15.0
|
# libcap2: OpenSUSE Leap 42.3, OpenSUSE Leap 15.0
|
||||||
|
|
Loading…
Reference in New Issue