Skip to contentSkip to conversation

ndctl.spec.in: make xmlto BuildRequires depend on rhel < 9

PATCH Applied Alison Schofield 1 participant 2 messages Jul 22 libnvdimm: non-volatile memory device

lore
Share & tools
lore

Alison Schofield

author maintainer
#0 lore raw

PATCH 1/1 ndctl.spec.in: make xmlto BuildRequires depend on rhel < 9

From: Michal Schorm <[email protected]>

'xmlto' is only needed alongside 'asciidoc' on RHEL < 9. On Fedora and RHEL >= 9, documentation is built with 'rubygem-asciidoctor' via '-Dasciidoctor=enabled', which does not require 'xmlto'. Move the dependency inside the existing RHEL < 9 conditional.

Related: rhbz#2503124

Reposted from:
https://src.fedoraproject.org/rpms/ndctl/pull-request/4#

---

Michal, ndctl tool operates via mailing list, not PRs, so reposted your fixup here.

 ndctl.spec.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
ndctl.spec.in +1 -1
index ae9466c45192..f6c0f6992249 100644
@@ -12,6 +12,7 @@ Requires:	CXL_LNAME%{?_isa} = %{version}-%{release}
 BuildRequires:	autoconf
 %if 0%{?rhel} && 0%{?rhel} < 9
 BuildRequires:	asciidoc
+BuildRequires:	xmlto
 %define asciidoctor -Dasciidoctor=disabled
 %define libtracefs -Dlibtracefs=disabled
 %else
@@ -21,7 +22,6 @@ BuildRequires:	libtracefs-devel
 %define asciidoctor -Dasciidoctor=enabled
 %define libtracefs -Dlibtracefs=enabled
 %endif
-BuildRequires:	xmlto
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
Signature · 1 line
2.37.3
author maintainer Applied
#1 lore raw
Quoted 1 line · Alison Schofield

From: Michal Schorm <[email protected]>

Mailer caught my mistake above, missing a c in Schorm. I'll fix that up.

Applied to pending for NDCTL v86
https://github.com/pmem/ndctl/commits/pending/

Quoted 46 lines

'xmlto' is only needed alongside 'asciidoc' on RHEL < 9. On Fedora and RHEL >= 9, documentation is built with 'rubygem-asciidoctor' via '-Dasciidoctor=enabled', which does not require 'xmlto'. Move the dependency inside the existing RHEL < 9 conditional.

Related: rhbz#2503124

Reposted from:
https://src.fedoraproject.org/rpms/ndctl/pull-request/4#

---

Michal, ndctl tool operates via mailing list, not PRs, so reposted your fixup here.

 ndctl.spec.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
ndctl.spec.in +1 -1
index ae9466c45192..f6c0f6992249 100644
@@ -12,6 +12,7 @@ Requires:	CXL_LNAME%{?_isa} = %{version}-%{release}
 BuildRequires:	autoconf
 %if 0%{?rhel} && 0%{?rhel} < 9
 BuildRequires:	asciidoc
+BuildRequires:	xmlto
 %define asciidoctor -Dasciidoctor=disabled
 %define libtracefs -Dlibtracefs=disabled
 %else
@@ -21,7 +22,6 @@ BuildRequires:	libtracefs-devel
 %define asciidoctor -Dasciidoctor=enabled
 %define libtracefs -Dlibtracefs=enabled
 %endif
-BuildRequires:	xmlto
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
Signature · 1 line
2.37.3