From: Richard W.M. Jones Date: Thu, 8 Feb 2024 13:23:07 +0000 (+0000) Subject: Multiple fixes X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=bc85a03dead47659944a67aa36026aae9aa8bc36;p=fedora-reviews.git Multiple fixes Get rid of %{major_version} so we know when the ABI breaks. Move libs to correct subdirectories. Get rid of devel-static, not needed as it just duplicates devel. Rename xnvme-cli to xnvme-tools. --- diff --git a/xnvme/xnvme.spec b/xnvme/xnvme.spec index 4d3060e..7cf3a90 100644 --- a/xnvme/xnvme.spec +++ b/xnvme/xnvme.spec @@ -7,10 +7,10 @@ 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 - -%global major_version %(echo %{version} | cut -b 1) +BuildRequires: meson +BuildRequires: gcc +BuildRequires: libaio-devel +BuildRequires: liburing-devel %description %{summary}. @@ -23,7 +23,7 @@ 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} @@ -31,19 +31,11 @@ Summary: Static library for %{name} %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 @@ -57,22 +49,17 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %meson_install %files -%{_libdir}/lib%{name}.so -%{_libdir}/lib%{name}.so.%{major_version} -%{_libdir}/lib%{name}.so.%{version} +%{_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 @@ -87,9 +74,13 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %{_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 +%{_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 +* Thu Feb 08 2024 Richard W.M. Jones - 0.7.4-1 +- Initial version