SOURCES/libzfcphbaapi-c99.patch

@@ -1,46 +0,0 @@
-Declare sysfs_getAdapterAttributes in vlib_sysfs.h, to avoid an
-implicit function declaration in vlib.c.
-
-Include <sys/time.h> in fc_tools/zfcp_ping.c for gettimeofday.
-
-Include <scsi/sg_cmds.h> in vlib_sg.c, to avoid further
-implicit function declarations.
-
-diff --git a/fc_tools/zfcp_ping.c b/fc_tools/zfcp_ping.c
-index 3cf90d8981936c20..0fa34c4702f4cfd2 100644
---- a/fc_tools/zfcp_ping.c
-+++ b/fc_tools/zfcp_ping.c
-@@ -13,6 +13,7 @@
- #include <signal.h>
- #include <hbaapi.h>
- #include <errno.h>
-+#include <sys/time.h>
- #include "include/zfcp_util.h"
- 
- #define FC_PNG_REV              0x00000001
-diff --git a/vlib_sg.c b/vlib_sg.c
-index 78f0476378e23b2d..b60ffa6de6aea6db 100644
---- a/vlib_sg.c
-+++ b/vlib_sg.c
-@@ -21,6 +21,8 @@
- 
- #include "vlib.h"
- 
-+#include <scsi/sg_cmds.h>
-+
- #define INTERVAL	10000000
- #define RETRIES		1500
- 
-diff --git a/vlib_sysfs.h b/vlib_sysfs.h
-index 2da344e6d9f5f2ea..c8f9ead4f31c7c27 100644
---- a/vlib_sysfs.h
-+++ b/vlib_sysfs.h
-@@ -35,6 +35,8 @@ HBA_STATUS sysfs_createAndReadConfigPorts(struct vlib_adapter *);
- HBA_STATUS sysfs_createAndReadConfigAdapter();
- HBA_STATUS sysfs_getDiscoveredPortAttributes(HBA_PORTATTRIBUTES **,
- 						struct vlib_port *);
-+HBA_STATUS sysfs_getAdapterAttributes(HBA_ADAPTERATTRIBUTES **,
-+						struct vlib_adapter *);
- HBA_STATUS sysfs_getAdapterPortAttributes(HBA_PORTATTRIBUTES **,
- 						struct vlib_adapter *);
- HBA_STATUS sysfs_getPortStatistics(HBA_PORTSTATISTICS **,

SPECS/libzfcphbaapi.spec

@@ -3,13 +3,12 @@
 Name:           libzfcphbaapi
 Summary:        HBA API for the zFCP device driver
 Version:        2.2.0
-Release:        24%{?dist}
-License:        CPL-1.0
+Release:        15%{?dist}
+License:        CPL
 URL:            http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi.html
 # http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi-%%{hbaapiver}.html
 Source0:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/%{srcname}-%{version}.tar.gz
 Patch1:         %{srcname}-2.1.1-fedora.patch
-Patch2: libzfcphbaapi-c99.patch
 
 ExclusiveArch:  s390 s390x
 
@@ -44,8 +43,7 @@ Documentation in HTML format for the zFCP HBA API Library.
 %prep
 %setup -q -n %{srcname}-%{version}
 
-%patch 1 -p1 -b .fedora
-%patch 2 -p1
+%patch1 -p1 -b .fedora
 
 
 %build
@@ -93,45 +91,19 @@ fi
 
 
 %changelog
-* Tue Jul 09 2024 Dan Horák <dhorak@redhat.com> - 2.2.0-24
-- rebuild
-- Resolves: RHEL-24053
+* Thu Apr 14 2022 Dan Horák <dhorak@redhat.com> - 2.2.0-15
+- add devel subpackage (#2069642)
+- Resolves: #2069642
 
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.2.0-23
-- Bump release for June 2024 mass rebuild
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.2.0-14
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Sun Feb 11 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 2.2.0-22
-- Rebuilt for sg3_utils 1.48
+* Thu May 27 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.2.0-13
+- Rebuilt for sg3_utils 1.47 (#1955157)
 
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jan 27 2023 Florian Weimer <fweimer@redhat.com> - 2.2.0-18
-- Fix C99 compatibility issues (#2165019)
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Apr 14 2022 Dan Horák <dan[at]danny.cz> - 2.2.0-15
-- add devel subpackage
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Apr 06 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.2.0-12
-- rebuilt for sg3_utils 1.46
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.2.0-12
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Mon Mar 01 2021 Dan Horák <dan[at]danny.cz> - 2.2.0-11
 - drop superfluous BR