X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=xnvme%2Fxnvme.spec;h=497e94d8fddbd6f0baff4e7f34c576d9fb0cd8b5;hb=HEAD;hp=4d3060e8a3e65d2fb63e70835be3626bfc39b53a;hpb=57b250cf742e3e3abb4957d29ae118a04dcbf682;p=fedora-reviews.git

diff --git a/xnvme/xnvme.spec b/xnvme/xnvme.spec
index 4d3060e..497e94d 100644
--- a/xnvme/xnvme.spec
+++ b/xnvme/xnvme.spec
@@ -1,16 +1,20 @@
 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
 
-BuildRequires:  meson gcc
-BuildRequires:  libaio-devel liburing-devel
+# The package makes 64 bit assumptions so exclude 32 bit i686.
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch:    %{ix86}
 
-%global major_version %(echo %{version} | cut -b 1)
+BuildRequires:  meson
+BuildRequires:  gcc
+BuildRequires:  libaio-devel
+BuildRequires:  liburing-devel
 
 %description
 %{summary}.
@@ -23,27 +27,20 @@ Summary:        Development library and header files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
-%{summary}.
+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}.
 
-%package devel-static
-Summary:        Static development library and header files for %{name}
-Requires:       %{name}-static%{?_isa} = %{version}-%{release}
-
-%description devel-static
-%{summary}.
-
-
-%package cli
+%package tools
 Summary:        Command-line tools for storage I/O and NVMe-native development
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description cli
+%description tools
 %{summary}.
 
 %prep
@@ -56,23 +53,22 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %install
 %meson_install
 
+%check
+%meson_test
+
 %files
-%{_libdir}/lib%{name}.so
-%{_libdir}/lib%{name}.so.%{major_version}
-%{_libdir}/lib%{name}.so.%{version}
+%license LICENSE
+%{_libdir}/lib%{name}.so.0*
 
 %files devel
-%{_includedir}/lib%{name}*.h
+%{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
+%{_includedir}/lib%{name}*.h
 
 %files static
 %{_libdir}/lib%{name}.a
 
-%files devel-static
-%{_includedir}/lib%{name}*.h
-%{_libdir}/pkgconfig/%{name}.pc
-
-%files cli
+%files tools
 %{_bindir}/kvs
 %{_bindir}/lblk
 %{_bindir}/xdd
@@ -80,16 +76,25 @@ 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*
-/usr/share/bash-completion/completions/kvs-completions
-/usr/share/bash-completion/completions/lblk-completions
-/usr/share/bash-completion/completions/xdd-completions
-/usr/share/bash-completion/completions/%{name}-completions
-/usr/share/bash-completion/completions/%{name}_file-completions
-/usr/share/bash-completion/completions/zoned-completions
+%{_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
+%{_datadir}/bash-completion/completions/%{name}-completions
+%{_datadir}/bash-completion/completions/%{name}_file-completions
+%{_datadir}/bash-completion/completions/zoned-completions
+
+%changelog
+* Mon Feb 19 2024 Richard W.M. Jones <rjones@redhat.com> - 0.7.4-2
+- Initial version