On Tue, 2020-10-06 at 17:15 -0700, Dan Williams wrote:
Until RHEL moves to asciidoctor fallback to the old asciidoc for
RHEL
builds.
Signed-off-by: Dan Williams <dan.j.williams(a)intel.com>
---
ndctl.spec.in | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
Thanks Dan - looks good!
I applied this and tested with a copr build for el8, and it all looks
good:
https://download.copr.fedorainfracloud.org/results/djbw/ndctl/epel-8-x86_...
diff --git a/ndctl.spec.in b/ndctl.spec.in
index 94e15ad309c5..056c53069082 100644
--- a/ndctl.spec.in
+++ b/ndctl.spec.in
@@ -9,7 +9,12 @@
Source0:
https://github.com/pmem/%{name}/archive/v%{version}.tar.gz#/%{name}-%{v
Requires: LNAME%{?_isa} = %{version}-%{release}
Requires: DAX_LNAME%{?_isa} = %{version}-%{release}
BuildRequires: autoconf
+%if 0%{?rhel} < 9
+BuildRequires: asciidoc
+%define asciidoc --disable-asciidoctor
+%else
BuildRequires: rubygem-asciidoctor
+%endif
BuildRequires: xmlto
BuildRequires: automake
BuildRequires: libtool
@@ -86,7 +91,7 @@ control API for these devices.
%build
echo %{version} > version
./autogen.sh
-%configure --disable-static --disable-silent-rules
+%configure --disable-static --disable-silent-rules %{?asciidoc}
make %{?_smp_mflags}
%install