From bf965c2d61902d068c0df32bddfa6822da302811 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 4 Dec 2025 12:33:42 +0000
Subject: [PATCH] Import from AlmaLinux stable repository

---
 .gitignore                                    |  2 +-
 .libzfcphbaapi.metadata                       |  2 +-
 ...patch => libzfcphbaapi-3.0.2-fedora.patch} | 13 -------
 SPECS/libzfcphbaapi.spec                      | 35 +++++++++----------
 4 files changed, 19 insertions(+), 33 deletions(-)
 rename SOURCES/{lib-zfcp-hbaapi-2.1.1-fedora.patch => libzfcphbaapi-3.0.2-fedora.patch} (60%)

diff --git a/.gitignore b/.gitignore
index fe91b18..6a0fee8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/lib-zfcp-hbaapi-2.2.0.tar.gz
+SOURCES/libzfcphbaapi-3.0.3.tar.gz
diff --git a/.libzfcphbaapi.metadata b/.libzfcphbaapi.metadata
index eaa8d4a..673a700 100644
--- a/.libzfcphbaapi.metadata
+++ b/.libzfcphbaapi.metadata
@@ -1 +1 @@
-b876346c88aefc3cec6e0f888820463b29fcff05 SOURCES/lib-zfcp-hbaapi-2.2.0.tar.gz
+036ea939d26a066446ce7e34dde7967176225cfd SOURCES/libzfcphbaapi-3.0.3.tar.gz
diff --git a/SOURCES/lib-zfcp-hbaapi-2.1.1-fedora.patch b/SOURCES/libzfcphbaapi-3.0.2-fedora.patch
similarity index 60%
rename from SOURCES/lib-zfcp-hbaapi-2.1.1-fedora.patch
rename to SOURCES/libzfcphbaapi-3.0.2-fedora.patch
index 42489b4..c7fbeb6 100644
--- a/SOURCES/lib-zfcp-hbaapi-2.1.1-fedora.patch
+++ b/SOURCES/libzfcphbaapi-3.0.2-fedora.patch
@@ -23,19 +23,6 @@ index a9a040d..bddc86f 100644
  bin_PROGRAMS = zfcp_ping zfcp_show
  
  zfcp_ping_SOURCES = fc_tools/zfcp_ping.c
-diff --git a/Makefile.in b/Makefile.in
-index f459693..b9c7712 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -407,6 +407,8 @@ libzfcphbaapi_la_LDFLAGS = \
- 	-Wl,-init,_initvlib,-fini,_finivlib \
- 	-export-symbols $(SYMFILE)
- 
-+@VENDORLIB_TRUE@libzfcphbaapi_la_LDFLAGS += -module -avoid-version -release $(VERSION)
-+
- zfcp_ping_SOURCES = fc_tools/zfcp_ping.c
- zfcp_show_SOURCES = fc_tools/zfcp_show.c
- @VENDORLIB_FALSE@zfcp_ping_LDADD = -lzfcphbaapi
 -- 
 1.8.5.3
 
diff --git a/SPECS/libzfcphbaapi.spec b/SPECS/libzfcphbaapi.spec
index db3671b..6ee28f1 100644
--- a/SPECS/libzfcphbaapi.spec
+++ b/SPECS/libzfcphbaapi.spec
@@ -1,19 +1,16 @@
-%global srcname lib-zfcp-hbaapi
-
 Name:           libzfcphbaapi
 Summary:        HBA API for the zFCP device driver
-Version:        2.2.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
+Version:        3.0.3
+Release:        1%{?dist}
+License:        EPL-1.0
+URL:            https://github.com/ibm-s390-linux/libzfcphbaapi
+Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch1:         %{name}-3.0.2-fedora.patch
 
 ExclusiveArch:  s390 s390x
 
 BuildRequires:  gcc
-BuildRequires:  automake
+BuildRequires:  automake autoconf libtool
 BuildRequires:  doxygen
 BuildRequires:  sg3_utils-devel
 BuildRequires:  make
@@ -41,17 +38,14 @@ Documentation in HTML format for the zFCP HBA API Library.
 
 
 %prep
-%setup -q -n %{srcname}-%{version}
-
-%patch1 -p1 -b .fedora
+%autosetup
 
 
 %build
+autoreconf -vif
+
 %configure --disable-static
-# manually disable rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make EXTRA_CFLAGS="-fno-strict-aliasing"
+%make_build EXTRA_CFLAGS="-fno-strict-aliasing"
 
 
 %install
@@ -70,7 +64,8 @@ fi
 
 
 %files
-%doc README COPYING ChangeLog AUTHORS LICENSE
+%license LICENSE
+%doc README COPYING ChangeLog AUTHORS
 %{_bindir}/zfcp_ping
 %{_bindir}/zfcp_show
 %{_libdir}/%{name}.so.*
@@ -91,6 +86,10 @@ fi
 
 
 %changelog
+* Tue Jun 10 2025 Dan Horák <dhorak@redhat.com> - 3.0.3-1
+- updated to 3.0.3
+- Resolves: RHEL-62974
+
 * Thu Apr 14 2022 Dan Horák <dhorak@redhat.com> - 2.2.0-15
 - add devel subpackage (#2069642)
 - Resolves: #2069642