SOURCES/lsscsi-0.33-wwn-trunc.patch

@@ -1,25 +0,0 @@
-From c13c9d3a90aec4779a0cbe484913f24bce947ab1 Mon Sep 17 00:00:00 2001
-From: Wenchao Hao <haowenchao@huawei.com>
-Date: Tue, 8 Jun 2021 16:26:04 +0800
-Subject: [PATCH] Fix lsscsi wwn number output error
-
-The true wwn number is from the sixth byte of scsi-*
-
-Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
----
- src/lsscsi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lsscsi.c b/src/lsscsi.c
-index 6f6953f..2be3ab9 100644
---- a/src/lsscsi.c
-+++ b/src/lsscsi.c
-@@ -1515,7 +1515,7 @@ collect_disk_wwn_nodes(void)
- 
-                 cur_ent = &cur_list->nodes[cur_list->count];
-                 my_strcopy(cur_ent->wwn, "0x", 3);
--                my_strcopy(cur_ent->wwn + 2, dep->d_name + 5,
-+                my_strcopy(cur_ent->wwn + 2, dep->d_name + 6,
-                            sizeof(cur_ent->wwn) - 2);
-                 my_strcopy(cur_ent->disk_bname, basename(symlink_path),
-                            sizeof(cur_ent->disk_bname));

SPECS/lsscsi.spec

@@ -1,15 +1,13 @@
 Summary:        List SCSI devices (or hosts) and associated information
 Name:           lsscsi
 Version:        0.32
-Release:        6%{?dist}
+Release:        12%{?dist}
-License:        GPLv2+
+License:        GPL-2.0-or-later
 # official git repository: https://github.com/doug-gilbert/lsscsi
 Source0:        http://sg.danny.cz/scsi/%{name}-%{version}.tgz
 URL:            http://sg.danny.cz/scsi/lsscsi.html
 BuildRequires:  gcc
-BuildRequires: make
+BuildRequires:  make
-# https://bugzilla.redhat.com/show_bug.cgi?id=1981038
-Patch0:         lsscsi-0.33-wwn-trunc.patch
 
 %description
 Uses information provided by the sysfs pseudo file system in Linux kernel
@@ -23,10 +21,10 @@ Author:
 
 
 %prep
-%autosetup -p 1 -n %{name}-0.32
+%autosetup -p1
 
 %build
-%configure
+%configure --disable-nvme-supp
 %make_build
 
 
@@ -41,19 +39,35 @@ Author:
 
 
 %changelog
-* Tue Aug 17 2021 Tomas Bzatek <tbzatek@redhat.com> - 0.32-6
+* Tue May 07 2024 Tomas Bzatek <tbzatek@redhat.com> - 0.32-12
-- Fix the gating tests
+- Disable NVMe support
 
-* Mon Aug 16 2021 Tomas Bzatek <tbzatek@redhat.com> - 0.32-5
+* Mon Feb 12 2024 Tomas Bzatek <tbzatek@redhat.com> - 0.32-11
-- Rebase to proper upstream 0.32 release (r167)
+- Use a SPDX license tag
-- Fix WWN ID truncation (#1981038)
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.32-4
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-10
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-  Related: rhbz#1991688
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.32-3
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-9
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri May 07 2021 Dan Horák <dan[at]danny.cz> - 0.32-3
+- update to 0.32 final
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild