From ecf6235f77975531a5034e5fe55829b7a066f9c1 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Mar 04 2022 11:25:49 +0000
Subject: * Fri Mar 04 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.0~rc5-1

- Upstream v1.0 Release Candidate 5

---

diff --git a/.gitignore b/.gitignore
index 1a99cdd..184a4e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /libnvme-1.0-rc4.tar.gz
+/libnvme-1.0-rc5.tar.gz
diff --git a/libnvme-1.0-rc5-ccan_headers.patch b/libnvme-1.0-rc5-ccan_headers.patch
deleted file mode 100644
index 222f810..0000000
--- a/libnvme-1.0-rc5-ccan_headers.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d43a9f73ae4980606a6cbfa1777486d9dcc495b2 Mon Sep 17 00:00:00 2001
-From: Martin Belanger <martin.belanger@dell.com>
-Date: Mon, 28 Feb 2022 11:26:07 -0500
-Subject: [PATCH] Move ccan definitions out of public headers.
-
-Signed-off-by: Martin Belanger <martin.belanger@dell.com>
----
- src/nvme/util.c | 6 ++++++
- src/nvme/util.h | 7 +------
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/nvme/util.c b/src/nvme/util.c
-index 7d8a40b2..c95f16b3 100644
---- a/src/nvme/util.c
-+++ b/src/nvme/util.c
-@@ -759,3 +759,9 @@ size_t get_entity_version(char *buffer, size_t bufsz)
- 
- 	return num_bytes;
- }
-+
-+struct nvmf_ext_attr *nvmf_exat_ptr_next(struct nvmf_ext_attr *p)
-+{
-+	return (struct nvmf_ext_attr *)
-+		((uintptr_t)p + (ptrdiff_t)nvmf_exat_size(le16_to_cpu(p->exatlen)));
-+}
-diff --git a/src/nvme/util.h b/src/nvme/util.h
-index f1f6fcb6..f034c1b7 100644
---- a/src/nvme/util.h
-+++ b/src/nvme/util.h
-@@ -10,7 +10,6 @@
- #define _LIBNVME_UTIL_H
- 
- #include "types.h"
--#include <ccan/endian/endian.h>
- 
- /**
-  * DOC: util.h
-@@ -548,10 +547,6 @@ static inline __u16 nvmf_exat_size(size_t val_len)
-  *
-  * Return: Pointer to the next element in the array.
-  */
--static inline struct nvmf_ext_attr *nvmf_exat_ptr_next(struct nvmf_ext_attr *p)
--{
--	return (struct nvmf_ext_attr *)
--		((uintptr_t)p + (ptrdiff_t)nvmf_exat_size(le16_to_cpu(p->exatlen)));
--}
-+struct nvmf_ext_attr *nvmf_exat_ptr_next(struct nvmf_ext_attr *p);
- 
- #endif /* _LIBNVME_UTIL_H */
diff --git a/libnvme.spec b/libnvme.spec
index 7b25559..65e51c5 100644
--- a/libnvme.spec
+++ b/libnvme.spec
@@ -3,15 +3,12 @@
 
 Name:    libnvme
 Summary: Linux-native nvme device management library
-Version: 1.0~rc4
+Version: 1.0~rc5
 Release: 1%{?dist}
 License: LGPLv2+
 URL:     https://github.com/linux-nvme/libnvme
 Source0: %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz
 
-# https://github.com/linux-nvme/libnvme/pull/261
-Patch1:  libnvme-1.0-rc5-ccan_headers.patch
-
 BuildRequires: gcc gcc-c++
 BuildRequires: swig
 BuildRequires: python3-devel
@@ -89,6 +86,9 @@ rm -rf %{buildroot}%{_pkgdocdir}/nvme
 %{python3_sitearch}/libnvme/*
 
 %changelog
+* Fri Mar 04 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.0~rc5-1
+- Upstream v1.0 Release Candidate 5
+
 * Mon Feb 28 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.0~rc4-1
 - Upstream v1.0 Release Candidate 4
 
diff --git a/sources b/sources
index 702d2af..43619f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libnvme-1.0-rc4.tar.gz) = 8e3b43dcf4d0fde28b488514f58142d625bf8dbce25dfc9de95a68cddfbdaf4c6ea202f36214c2c1b8b50d426105c03c463c88cd72d0af6d6f3d7eb6a7db47a0
+SHA512 (libnvme-1.0-rc5.tar.gz) = bc6334225a923057cbeb6c3f4439f3331979683d7b005e2df42e711119d68f80706b934174c103028a342c2006db312085912810348f254bbffaf37daee71130