From 50d1f75a8afe7185c32a5dcc9bb99880d3c3b656 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 19 Feb 2024 10:22:20 +0000
Subject: [PATCH] Misc fixes

https://bugzilla.redhat.com/show_bug.cgi?id=2263333#c3

Install license text.

Make -static depend on -devel.

Tighten up man page %file patterns.

Exclude i686.
---
 xnvme/xnvme.spec | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/xnvme/xnvme.spec b/xnvme/xnvme.spec
index 7cf3a90..c0a34a2 100644
--- a/xnvme/xnvme.spec
+++ b/xnvme/xnvme.spec
@@ -1,12 +1,16 @@
 Name:           xnvme
 Version:        0.7.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Unified API and tools for traditional and emerging I/O interfaces
 
 License:        BSD-3-Clause
 URL:            https://github.com/OpenMPDK/xNVMe
 Source:         %{url}/releases/download/v%{version}/xnvme-%{version}.tar.gz
 
+# The package makes 64 bit assumptions so exclude 32 bit i686.
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch:    %{ix86}
+
 BuildRequires:  meson
 BuildRequires:  gcc
 BuildRequires:  libaio-devel
@@ -27,6 +31,7 @@ This contains the headers and libraries for developing against %{name}.
 
 %package static
 Summary:        Static library for %{name}
+Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 
 %description static
 %{summary}.
@@ -49,6 +54,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %meson_install
 
 %files
+%license LICENSE
 %{_libdir}/lib%{name}.so.0*
 
 %files devel
@@ -67,13 +73,18 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %{_bindir}/%{name}-driver
 %{_bindir}/%{name}_file
 %{_bindir}/zoned
-%{_mandir}/man1/kvs*
-%{_mandir}/man1/lblk*
-%{_mandir}/man1/xdd*
-%{_mandir}/man1/%{name}-*
-%{_mandir}/man1/%{name}.1.gz
-%{_mandir}/man1/%{name}_file*
-%{_mandir}/man1/zoned*
+%{_mandir}/man1/kvs.1*
+%{_mandir}/man1/kvs-*.1*
+%{_mandir}/man1/lblk.1*
+%{_mandir}/man1/lblk-*.1*
+%{_mandir}/man1/xdd.1*
+%{_mandir}/man1/xdd-*.1*
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/%{name}-*.1*
+%{_mandir}/man1/%{name}_file.1*
+%{_mandir}/man1/%{name}_file-*.1*
+%{_mandir}/man1/zoned.1*
+%{_mandir}/man1/zoned-*.1*
 %{_datadir}/bash-completion/completions/kvs-completions
 %{_datadir}/bash-completion/completions/lblk-completions
 %{_datadir}/bash-completion/completions/xdd-completions
@@ -82,5 +93,5 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %{_datadir}/bash-completion/completions/zoned-completions
 
 %changelog
-* Thu Feb 08 2024 Richard W.M. Jones <rjones@redhat.com> - 0.7.4-1
+* Mon Feb 19 2024 Richard W.M. Jones <rjones@redhat.com> - 0.7.4-2
 - Initial version
-- 
1.8.3.1