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.

1 files changed, 3 insertions, 7 deletions

diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in
index f7d1812940..425bb6688c 100644
--- a/packaging/rpm/wireshark.spec.in
+++ b/packaging/rpm/wireshark.spec.in
@@ -80,18 +80,14 @@ BuildRequires:	ninja-build
 BuildRequires:	ninja
 %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.
-# Fedora & CentOS 7: rubygem-asciidoctor
-# CentOS 8: <no package? - https://bugzilla.redhat.com/show_bug.cgi?id=1820896>
+# Fedora & CentOS: rubygem-asciidoctor
+# CentOS 8: <added in - https://bugzilla.redhat.com/show_bug.cgi?id=1820896>
 # 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.
 
 # For the HTML guides, we need xsltproc, and the docbook stylesheets
 %if %{with guides}