diff --git a/.gitignore b/.gitignore index 1580e5b..5246427 100644 --- a/.gitignore +++ b/.gitignore @@ -36,9 +36,3 @@ /nvme-cli-2.9.1.tar.gz /nvme-cli-2.10.tar.gz /nvme-cli-2.10.2.tar.gz -/nvme-cli-2.11.tar.gz -/nvme-cli-2.12.tar.gz -/nvme-cli-2.13.tar.gz -/nvme-cli-2.14.tar.gz -/nvme-cli-2.15.tar.gz -/nvme-cli-2.16.tar.gz diff --git a/nvme-cli.spec b/nvme-cli.spec index 5fa7a3a..efc09a7 100644 --- a/nvme-cli.spec +++ b/nvme-cli.spec @@ -4,8 +4,8 @@ %global nmlibdir %{_prefix}/lib/NetworkManager Name: nvme-cli -Version: 2.16 -Release: 1%{?dist} +Version: 2.10.2 +Release: 2%{?dist} Summary: NVMe management command line interface License: GPL-2.0-only @@ -14,7 +14,7 @@ Source0: %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}. Source1: 99-nvme-nbft-connect.sh Source2: 99-nvme-nbft-no-ignore-carrier.conf -BuildRequires: meson >= 0.53 +BuildRequires: meson >= 0.50.0 BuildRequires: gcc gcc-c++ BuildRequires: systemd-devel BuildRequires: systemd-rpm-macros @@ -24,8 +24,8 @@ BuildRequires: openssl-devel BuildRequires: kernel-headers %endif -BuildRequires: libnvme-devel >= 1.16.1 -BuildRequires: json-c-devel >= 0.14 +BuildRequires: libnvme-devel >= 1.10 +BuildRequires: json-c-devel >= 0.13 BuildRequires: asciidoc BuildRequires: xmlto @@ -41,7 +41,7 @@ nvme-cli provides NVM-Express user space tooling for Linux. %build -%meson -Dudevrulesdir=%{_udevrulesdir} -Dsystemddir=%{_unitdir} -Dpdc-enabled=false -Ddocs=all -Ddocs-build=true -Dhtmldir=%{_pkgdocdir} +%meson -Dudevrulesdir=%{_udevrulesdir} -Dsystemddir=%{_unitdir} -Dpdc-enabled=true -Ddocs=all -Ddocs-build=true -Dhtmldir=%{_pkgdocdir} %meson_build @@ -68,30 +68,6 @@ mv %{buildroot}%{_pkgdocdir}/nvme %{buildroot}%{_pkgdocdir}/html rm -rf %{buildroot}%{_pkgdocdir}/nvme -%post -# https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_systemd -%systemd_post nvmefc-boot-connections.service -%systemd_post nvmf-autoconnect.service -%systemd_post nvmf-connect@.service -%systemd_post nvmf-connect-nbft.service -if [ -S /run/udev/control ]; then - udevadm control --reload - udevadm trigger -fi - -%preun -%systemd_preun nvmefc-boot-connections.service -%systemd_preun nvmf-autoconnect.service -%systemd_preun nvmf-connect@.service -%systemd_preun nvmf-connect-nbft.service - -%postun -%systemd_postun nvmefc-boot-connections.service -%systemd_postun nvmf-autoconnect.service -%systemd_postun nvmf-connect@.service -%systemd_postun nvmf-connect-nbft.service - - %files %license LICENSE %doc %{_pkgdocdir} @@ -108,10 +84,7 @@ fi %{_unitdir}/nvmf-connect-nbft.service %{_udevrulesdir}/65-persistent-net-nbft.rules %{_udevrulesdir}/70-nvmf-autoconnect.rules -%{_udevrulesdir}/70-nvmf-keys.rules %{_udevrulesdir}/71-nvmf-netapp.rules -%{_udevrulesdir}/71-nvmf-vastdata.rules -%{_udevrulesdir}/71-nvmf-hpe.rules # Do not install the dracut rule yet. See rhbz 1742764 # /usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf %{nmlibdir}/dispatcher.d/99-nvme-nbft-connect.sh @@ -119,39 +92,6 @@ fi %changelog -* Thu Dec 04 2025 Tomas Bzatek - 2.16-1 -- Update to 2.16 - -* Fri Aug 15 2025 Tomas Bzatek - 2.15-2 -- Fix nvme-list JSON output compatibility -- Rename 71-nvme-hpe.rules to 71-nvmf-hpe.rules - -* Fri Jul 25 2025 Tomas Bzatek - 2.15-1 -- Update to 2.15 - -* Thu Jul 24 2025 Fedora Release Engineering - 2.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Wed Jul 09 2025 Tomas Bzatek - 2.14-1 -- Update to 2.14 -- Disable Persistent Discovery Controllers by default - -* Fri Apr 11 2025 Tomas Bzatek - 2.13-1 -- Update to 2.13 - -* Mon Mar 17 2025 Tomas Bzatek - 2.12-1 -- Update to 2.12 - -* Tue Feb 04 2025 Tomas Bzatek - 2.11-3 -- Add systemd units scriptlets -- Reload udevd after installing udev rules - -* Fri Jan 17 2025 Fedora Release Engineering - 2.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Oct 31 2024 Tomas Bzatek - 2.11-1 -- Update to 2.11 - * Mon Aug 26 2024 Tomas Bzatek - 2.10.2-2 - Install NetworkManager override for nbft interfaces - Rename reconnect NetworkManager hook to 99-nvme-nbft-connect.sh diff --git a/sources b/sources index e58ea56..e394b84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nvme-cli-2.16.tar.gz) = 507018ff41832574bef5b88ea6a17336b9792c54f8e5c619d041bce23124e1d6d5e5e824407f46d4f1b4d6899125885eb14289f3399e61c7e7a59a603f1635e2 +SHA512 (nvme-cli-2.10.2.tar.gz) = 98ecb2488cdf21c83004204f4cb7e7d9327fef5a33e5a37d977c659d76be3cef861473676fa7fbd1d40f38742b365b98431e17d9b0318ddb4cc407953acdde87