From e5c3de679c99c57ed5f70c3cf2b7c5b56829a92e51d578b26977ec8edad9332d Mon Sep 17 00:00:00 2001
From: Daniel Wagner <daniel.wagner@suse.com>
Date: Wed, 4 Oct 2023 15:20:00 +0000
Subject: [PATCH] Accepting request 1115658 from home:wagi:branches:Base:System

- Enable test during build
- Drop minimum version meson dependency
- Add asciidoc dependency
- Build documentation when requested

OBS-URL: https://build.opensuse.org/request/show/1115658
OBS-URL: https://build.opensuse.org/package/show/Base:System/nvme-cli?expand=0&rev=142
---
 nvme-cli.changes |  8 ++++++++
 nvme-cli.spec    | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/nvme-cli.changes b/nvme-cli.changes
index 1e2e227..657e9df 100644
--- a/nvme-cli.changes
+++ b/nvme-cli.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Oct  4 15:11:19 UTC 2023 - Daniel Wagner <daniel.wagner@suse.com>
+
+- Enable test during build
+- Drop minimum version meson dependency
+- Add asciidoc dependency
+- Build documentation when requested
+
 -------------------------------------------------------------------
 Fri Sep 29 11:49:56 UTC 2023 - Daniel Wagner <daniel.wagner@suse.com>
 
diff --git a/nvme-cli.spec b/nvme-cli.spec
index f1e362b..fd28a7d 100644
--- a/nvme-cli.spec
+++ b/nvme-cli.spec
@@ -16,6 +16,8 @@
 #
 
 
+%bcond_without check
+
 Name:           nvme-cli
 Version:        2.6
 Release:        0
@@ -26,13 +28,14 @@ URL:            https://github.com/linux-nvme/nvme-cli/
 Source0:        nvme-cli-%{version}.tar.gz
 # downstream patches
 Patch100:       0100-harden_nvmf-connect@.service.patch
+BuildRequires:  asciidoc
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  libhugetlbfs-devel
 BuildRequires:  libjson-c-devel
 BuildRequires:  libnvme-devel
 BuildRequires:  libuuid-devel
-BuildRequires:  meson >= 0.50.0
+BuildRequires:  meson
 BuildRequires:  pkgconfig
 BuildRequires:  xmlto
 BuildRequires:  zlib-devel
@@ -87,9 +90,16 @@ Optional dependency offering zsh completion for NVM Express user space tools
     -Ddracutrulesdir=%{_sysconfdir}/dracut/dracut.conf.d \
     -Dsystemddir=%{_unitdir} \
     -Ddocs=man \
-    -Dsystemctl=%{_bindir}/systemctl
+    %{?_with_docs_build:-Ddocs-build=true} \
+    -Dsystemctl=%{_bindir}/systemctl \
+    -Dversion-tag=%{version}
 %meson_build
 
+%if %{with check}
+%check
+%meson_test
+%endif
+
 %install
 %meson_install
 install -m 644 -D /dev/null %{buildroot}%{_sysconfdir}/nvme/hostnqn