From 3b78aad9d0698370a091b35b2422da2925c03dd4 Mon Sep 17 00:00:00 2001
From: Andy Lutomirski <luto@kernel.org>
Date: Feb 24 2019 05:04:01 +0000
Subject: Bump to 1.7


---

diff --git a/.gitignore b/.gitignore
index 7707dd5..30175c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /v1.3.tar.gz
 /v1.4.tar.gz
 /v1.6.tar.gz
+/v1.7.tar.gz
diff --git a/nvme-cli.spec b/nvme-cli.spec
index 9a4c86e..d3792b3 100644
--- a/nvme-cli.spec
+++ b/nvme-cli.spec
@@ -1,29 +1,33 @@
-#%global commit0 bdbb4da0979fbdc079cf98410cdb31cf799e83b3
-#%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+#%%global commit0 bdbb4da0979fbdc079cf98410cdb31cf799e83b3
+#%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
 Name:           nvme-cli
-Version:        1.6
-Release:        2%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        NVMe management command line interface
 
 License:        GPLv2+
 URL:            https://github.com/linux-nvme/nvme-cli
-#Source0:        https://github.com/linux-nvme/%{name}/archive/%{commit0}.tar.gz
+#Source0:        https://github.com/linux-nvme/%%{name}/archive/%%{commit0}.tar.gz
 Source0:        https://github.com/linux-nvme/%{name}/archive/v%{version}.tar.gz
 
-BuildRequires:	libuuid-devel
-BuildRequires:	gcc
+BuildRequires:  libuuid-devel
+BuildRequires:  gcc
 
 %description
 nvme-cli provides NVM-Express user space tooling for Linux.
 
 %prep
-#%setup -qn %{name}-%{commit0}
-%setup
+#%%setup -qn %%{name}-%%{commit0}
+%setup -q
 
 
 %build
-make PREFIX=/usr CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" %{?_smp_mflags}
+
+# NB: the -I. part works around a bug fixed up stream by commit 254bcd6b2343
+# ("Fix CFLAGS parameter").  Rather than patching the fix in, I just added
+# an extra -I.  In the next release, we should be able to drop this hack.
+make PREFIX=/usr CFLAGS="%{optflags} -I." LDFLAGS="%{__global_ldflags}" %{?_smp_mflags}
 
 
 %install
@@ -35,10 +39,14 @@ make PREFIX=/usr CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" %{?_smp_mfla
 %doc README.md
 %{_sbindir}/nvme
 %{_mandir}/man1/nvme*.gz
-%{_datadir}/bash_completion.d/nvme
+%{_datadir}/bash-completion/completions/nvme
 
 
 %changelog
+* Sun Feb 24 2019 luto@kernel.org - 1.7-1
+- Bump to 1.7
+- Clean up some trivial rpmlint complaints
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 458de70..a13f71e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.6.tar.gz) = 05bcc539febd047f092a236ef2b2e9ad4e1df5d38bdc70416f80217425767f414e72294fda46868323cb7c77662d6000eaf16ebdaf74bdfad1baaed11b025d39
+SHA512 (v1.7.tar.gz) = 777b3d894017a18f65ca98af6af9345090b60fe7be6a01591ca6be978b03337beb36377ec81d5c0b89272ec43467330872080b7b23549b6152ba8e02fb3393de