From 86b809411802d52fc60395f16254ae237318e180e5f0573c2c9e7ab378c20bcc Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Wed, 4 Oct 2023 10:40:56 +0000 Subject: [PATCH 1/2] Accepting request 1115575 from home:wagi:branches:Base:System - Drop unencessary minimum version depedency on meson. - Re-enable libdbus feature. Upstream defaults changed. OBS-URL: https://build.opensuse.org/request/show/1115575 OBS-URL: https://build.opensuse.org/package/show/Base:System/libnvme?expand=0&rev=42 --- libnvme.changes | 6 ++++++ libnvme.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libnvme.changes b/libnvme.changes index ccb7f8f..6c43967 100644 --- a/libnvme.changes +++ b/libnvme.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 4 10:32:55 UTC 2023 - Daniel Wagner + +- Drop unencessary minimum version depedency on meson. +- Re-enable libdbus feature. Upstream defaults changed. + ------------------------------------------------------------------- Fri Sep 29 11:42:15 UTC 2023 - Daniel Wagner diff --git a/libnvme.spec b/libnvme.spec index 63f5be4..0c91ec6 100644 --- a/libnvme.spec +++ b/libnvme.spec @@ -32,7 +32,7 @@ BuildRequires: keyutils-devel BuildRequires: libjson-c-devel BuildRequires: libuuid-devel BuildRequires: make -BuildRequires: meson >= 0.50.0 +BuildRequires: meson BuildRequires: openssl-devel BuildRequires: python3-devel BuildRequires: swig @@ -78,7 +78,7 @@ Python binding part. %build export KBUILD_BUILD_TIMESTAMP=@${SOURCE_DATE_EPOCH:-$(date +%s)} -%meson -Ddocs=man %{?_with_docs_build:-Ddocs-build=true} +%meson -Ddocs=man %{?_with_docs_build:-Ddocs-build=true} -Dlibdbus=enabled %meson_build %install From 0662d4a9b733bd2b32a0c41b92d7811a248b00c1c94ef748d073ff0b9a4069fa Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Wed, 4 Oct 2023 14:36:14 +0000 Subject: [PATCH 2/2] Accepting request 1115640 from home:wagi:branches:Base:System - Enable tests during build - Set git version tag - Drop unused make dependency OBS-URL: https://build.opensuse.org/request/show/1115640 OBS-URL: https://build.opensuse.org/package/show/Base:System/libnvme?expand=0&rev=43 --- libnvme.changes | 7 +++++++ libnvme.spec | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libnvme.changes b/libnvme.changes index 6c43967..2f3f68d 100644 --- a/libnvme.changes +++ b/libnvme.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 4 14:31:09 UTC 2023 - Daniel Wagner + +- Enable tests during build +- Set git version tag +- Drop unused make dependency + ------------------------------------------------------------------- Wed Oct 4 10:32:55 UTC 2023 - Daniel Wagner diff --git a/libnvme.spec b/libnvme.spec index 0c91ec6..7fb5bbc 100644 --- a/libnvme.spec +++ b/libnvme.spec @@ -18,6 +18,8 @@ %define sover 1 +%bcond_without check + Name: libnvme Version: 1.6 Release: 0 @@ -31,7 +33,6 @@ BuildRequires: gcc-c++ BuildRequires: keyutils-devel BuildRequires: libjson-c-devel BuildRequires: libuuid-devel -BuildRequires: make BuildRequires: meson BuildRequires: openssl-devel BuildRequires: python3-devel @@ -78,9 +79,14 @@ Python binding part. %build export KBUILD_BUILD_TIMESTAMP=@${SOURCE_DATE_EPOCH:-$(date +%s)} -%meson -Ddocs=man %{?_with_docs_build:-Ddocs-build=true} -Dlibdbus=enabled +%meson -Ddocs=man %{?_with_docs_build:-Ddocs-build=true} -Dversion-tag=%{version} -Dlibdbus=enabled %meson_build +%if %{with check} +%check +%meson_test +%endif + %install %meson_install