From c397bf9c7e3c45e16035d5f1d22683e7ac3221e6a6d6ad51906d18a0b20ddc75 Mon Sep 17 00:00:00 2001
From: Daniel Wagner <daniel.wagner@suse.com>
Date: Wed, 2 Feb 2022 06:30:55 +0000
Subject: [PATCH] Accepting request 950642 from home:wagi:branches:Base:System

- Update to version 2.0~2:
  * Adapt to logging API changes in libnvme
  * Adapt to scan API changes in libnvme
  * Reworked error message handling
  * Fix 'list-ns' (bsc#1195151)
  * Add 'gen-tls-key' and 'check-tls-key'
  * Add Media Unit Status log page support
  * Cleanups and build fixes
- Fix path to systemctl (bsc#1193699)

OBS-URL: https://build.opensuse.org/request/show/950642
OBS-URL: https://build.opensuse.org/package/show/Base:System/nvme-cli?expand=0&rev=103
---
 _service               |  2 +-
 _servicedata           |  4 ++--
 nvme-cli-2.0~0.obscpio |  3 ---
 nvme-cli-2.0~2.obscpio |  3 +++
 nvme-cli.changes       | 13 +++++++++++++
 nvme-cli.obsinfo       |  6 +++---
 nvme-cli.spec          |  6 ++++--
 7 files changed, 26 insertions(+), 11 deletions(-)
 delete mode 100644 nvme-cli-2.0~0.obscpio
 create mode 100644 nvme-cli-2.0~2.obscpio

diff --git a/_service b/_service
index 40fa74e..f7a0aaa 100644
--- a/_service
+++ b/_service
@@ -5,7 +5,7 @@
     <param name="filename">nvme-cli</param>
     <!-- <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> -->
     <param name="versionformat">@PARENT_TAG@</param>
-    <param name="revision">v2.0-rc0</param>
+    <param name="revision">v2.0-rc2</param>
     <param name="match-tag">v[02].[0-9]*</param>
     <param name="versionrewrite-pattern">v([^+]*)-rc([0-9]+)</param>
     <param name="versionrewrite-replacement">\1~\2</param>
diff --git a/_servicedata b/_servicedata
index fdda04b..11c220a 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">https://github.com/linux-nvme/nvme-cli.git</param>
-    <param name="changesrevision">5cf86c2cbda7c5140ecca850ff3722c8ed90e622</param>
+    <param name="changesrevision">40571043c33142928566161b444e632727691e69</param>
   </service>
-</servicedata>
+</servicedata>
\ No newline at end of file
diff --git a/nvme-cli-2.0~0.obscpio b/nvme-cli-2.0~0.obscpio
deleted file mode 100644
index 5a513a8..0000000
--- a/nvme-cli-2.0~0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:efd2e583b1c205353c0246abfa33b134ab4a9bbc1171e8c58a0a077698b6f8a8
-size 5719053
diff --git a/nvme-cli-2.0~2.obscpio b/nvme-cli-2.0~2.obscpio
new file mode 100644
index 0000000..eac25ee
--- /dev/null
+++ b/nvme-cli-2.0~2.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dce4a7ae0ee8c5e33bb6ad776f3e5e38426062fc5d89f33832307931ab6a355d
+size 5554189
diff --git a/nvme-cli.changes b/nvme-cli.changes
index 0dc5396..9b71d24 100644
--- a/nvme-cli.changes
+++ b/nvme-cli.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Feb 01 11:39:02 UTC 2022 - daniel.wagner@suse.com
+
+- Update to version 2.0~2:
+  * Adapt to logging API changes in libnvme
+  * Adapt to scan API changes in libnvme
+  * Reworked error message handling
+  * Fix 'list-ns' (bsc#1195151)
+  * Add 'gen-tls-key' and 'check-tls-key'
+  * Add Media Unit Status log page support
+  * Cleanups and build fixes
+- Fix path to systemctl (bsc#1193699)
+
 -------------------------------------------------------------------
 Wed Jan 19 11:46:18 UTC 2022 - Daniel Wagner <daniel.wagner@suse.com>
 
diff --git a/nvme-cli.obsinfo b/nvme-cli.obsinfo
index b10a47c..929586c 100644
--- a/nvme-cli.obsinfo
+++ b/nvme-cli.obsinfo
@@ -1,4 +1,4 @@
 name: nvme-cli
-version: 2.0~0
-mtime: 1642167092
-commit: 7a97bca7b826941225baa96abb9c8551b8cc0b74
+version: 2.0~2
+mtime: 1643713026
+commit: e290046eff3cfc6035185b86e9c013c66e3a2b73
diff --git a/nvme-cli.spec b/nvme-cli.spec
index 430852c..62fc075 100644
--- a/nvme-cli.spec
+++ b/nvme-cli.spec
@@ -17,7 +17,7 @@
 
 
 Name:           nvme-cli
-Version:        2.0~0
+Version:        2.0~2
 Release:        0
 Summary:        NVM Express user space tools
 License:        GPL-2.0-only
@@ -31,7 +31,7 @@ BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  libhugetlbfs-devel
 BuildRequires:  libjson-c-devel
-BuildRequires:  libnvme-devel
+BuildRequires:  libnvme-devel >= 1.0~2
 BuildRequires:  libuuid-devel
 BuildRequires:  make
 BuildRequires:  meson >= 0.47.0
@@ -93,6 +93,8 @@ install -m 644 -D /dev/null %{buildroot}%{_sysconfdir}/nvme/hostid
 install -m 644 -D /dev/null %{buildroot}%{_sysconfdir}/nvme/discovery.conf
 rm %{buildroot}%{_sysconfdir}/dracut/dracut.conf.d/70-nvmf-autoconnect.conf
 
+sed -i 's;/bin/systemctl;/usr/bin/systemctl;g' %{buildroot}%{_udevrulesdir}/70-nvmf-autoconnect.rules
+
 # for subpackage nvme-cli-regress-script:
 install -m 744 -D regress %{buildroot}%{_sbindir}/nvme-regress