Compare commits
No commits in common. "c8" and "c9" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/lib-zfcp-hbaapi-2.2.0.tar.gz
|
SOURCES/libzfcphbaapi-3.0.3.tar.gz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
b876346c88aefc3cec6e0f888820463b29fcff05 SOURCES/lib-zfcp-hbaapi-2.2.0.tar.gz
|
036ea939d26a066446ce7e34dde7967176225cfd SOURCES/libzfcphbaapi-3.0.3.tar.gz
|
||||||
|
|||||||
@ -23,19 +23,6 @@ index a9a040d..bddc86f 100644
|
|||||||
bin_PROGRAMS = zfcp_ping zfcp_show
|
bin_PROGRAMS = zfcp_ping zfcp_show
|
||||||
|
|
||||||
zfcp_ping_SOURCES = fc_tools/zfcp_ping.c
|
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
|
1.8.5.3
|
||||||
|
|
||||||
@ -1,85 +1,62 @@
|
|||||||
%global srcname lib-zfcp-hbaapi
|
|
||||||
|
|
||||||
Name: libzfcphbaapi
|
Name: libzfcphbaapi
|
||||||
Summary: HBA API for the zFCP device driver
|
Summary: HBA API for the zFCP device driver
|
||||||
Group: System Environment/Libraries
|
Version: 3.0.3
|
||||||
Version: 2.2.0
|
Release: 1%{?dist}
|
||||||
Release: 2%{?dist}
|
License: EPL-1.0
|
||||||
License: CPL
|
URL: https://github.com/ibm-s390-linux/libzfcphbaapi
|
||||||
URL: http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi.html
|
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
# http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi-%%{hbaapiver}.html
|
Patch1: %{name}-3.0.2-fedora.patch
|
||||||
Source0: http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/%{srcname}-%{version}.tar.gz
|
|
||||||
Patch1: %{srcname}-2.1.1-fedora.patch
|
|
||||||
|
|
||||||
ExclusiveArch: s390 s390x
|
ExclusiveArch: s390 s390x
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: automake
|
BuildRequires: automake autoconf libtool
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: libsysfs-devel
|
|
||||||
BuildRequires: sg3_utils-devel
|
BuildRequires: sg3_utils-devel
|
||||||
BuildRequires: libhbaapi-devel
|
BuildRequires: make
|
||||||
Requires: libhbaapi
|
|
||||||
Requires(post): grep sed
|
Requires(post): grep sed
|
||||||
Requires(postun): grep sed
|
|
||||||
Provides: s390utils-libzfcphbaapi = 2:1.20.0-4
|
|
||||||
Obsoletes: s390utils-libzfcphbaapi <= 2:1.20.0-3
|
|
||||||
|
|
||||||
# exclude plugin soname from Provides
|
|
||||||
%global __provides_exclude ^(libzfcphbaapi-%{version}[.]so.*)$
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
zFCP HBA API Library is an implementation of FC-HBA (see www.t11.org) for
|
zFCP HBA API Library is an implementation of FC-HBA (see www.t11.org) for
|
||||||
the zFCP device driver.
|
the zFCP device driver.
|
||||||
|
|
||||||
|
|
||||||
%package docs
|
%package devel
|
||||||
License: CPL
|
Summary: Development files for zFCP HBA API Library
|
||||||
Summary: zFCP HBA API Library -- Documentation
|
Requires: %{name} = %{version}-%{release}
|
||||||
Group: Development/Libraries
|
Conflicts: libhbaapi-devel
|
||||||
URL: http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi.html
|
|
||||||
|
%description devel
|
||||||
|
Development files for the zFCP HBA API Library.
|
||||||
|
|
||||||
|
%package docs
|
||||||
|
Summary: Documentation for zFCP HBA API Library
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Provides: s390utils-libzfcphbaapi-docs = 2:1.20.0-4
|
|
||||||
Obsoletes: s390utils-libzfcphbaapi-docs <= 2:1.20.0-3
|
|
||||||
|
|
||||||
%description docs
|
%description docs
|
||||||
Documentation for the zFCP HBA API Library.
|
Documentation in HTML format for the zFCP HBA API Library.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{srcname}-%{version}
|
%autosetup
|
||||||
|
|
||||||
%patch1 -p1 -b .fedora
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-static --enable-vendor-lib
|
autoreconf -vif
|
||||||
make EXTRA_CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
|
||||||
|
%configure --disable-static
|
||||||
|
%make_build EXTRA_CFLAGS="-fno-strict-aliasing"
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%makeinstall docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}
|
%makeinstall docdir=%{buildroot}%{_docdir}/%{name}
|
||||||
# keep only html docs
|
# keep only html docs
|
||||||
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/latex
|
rm -rf %{buildroot}%{_docdir}/%{name}/latex
|
||||||
# remove unwanted files
|
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.*
|
|
||||||
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
# remove old entry from hba.conf on upgrade
|
# remove old entry from hba.conf on upgrade
|
||||||
if [ $1 == 2 ]; then
|
if [ $1 == 2 -a -f /etc/hba.conf ]; then
|
||||||
grep -q -e "^libzfcphbaapi" /etc/hba.conf &&
|
|
||||||
sed -i.orig -e "/^libzfcphbaapi/d" /etc/hba.conf
|
|
||||||
fi
|
|
||||||
# add entry to hba.conf on install and upgrade (resulting in a refresh together with ^)
|
|
||||||
# the grep ensures there won't be a duplicate entry after reinstall
|
|
||||||
grep -q -e "^libzfcphbaapi" /etc/hba.conf ||
|
|
||||||
echo "libzfcphbaapi %{_libdir}/libzfcphbaapi-%{version}.so" >> /etc/hba.conf
|
|
||||||
:
|
|
||||||
|
|
||||||
%postun
|
|
||||||
# remove entry from hba.conf on uninstall
|
|
||||||
if [ $1 == 0 ]; then
|
|
||||||
grep -q -e "^libzfcphbaapi" /etc/hba.conf &&
|
grep -q -e "^libzfcphbaapi" /etc/hba.conf &&
|
||||||
sed -i.orig -e "/^libzfcphbaapi/d" /etc/hba.conf
|
sed -i.orig -e "/^libzfcphbaapi/d" /etc/hba.conf
|
||||||
fi
|
fi
|
||||||
@ -87,31 +64,87 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc README COPYING ChangeLog AUTHORS LICENSE
|
%license LICENSE
|
||||||
|
%doc README COPYING ChangeLog AUTHORS
|
||||||
%{_bindir}/zfcp_ping
|
%{_bindir}/zfcp_ping
|
||||||
%{_bindir}/zfcp_show
|
%{_bindir}/zfcp_show
|
||||||
%{_libdir}/%{name}-%{version}.so
|
%{_libdir}/%{name}.so.*
|
||||||
%{_mandir}/man3/libzfcphbaapi.3*
|
%{_mandir}/man3/libzfcphbaapi.3*
|
||||||
%{_mandir}/man3/SupportedHBAAPIs.3*
|
%{_mandir}/man3/SupportedHBAAPIs.3*
|
||||||
%{_mandir}/man3/UnSupportedHBAAPIs.3*
|
%{_mandir}/man3/UnSupportedHBAAPIs.3*
|
||||||
%{_mandir}/man8/zfcp_ping.8*
|
%{_mandir}/man8/zfcp_ping.8*
|
||||||
%{_mandir}/man8/zfcp_show.8*
|
%{_mandir}/man8/zfcp_show.8*
|
||||||
%exclude %{_mandir}/man3/hbaapi.h.3*
|
|
||||||
%exclude %{_docdir}/%{name}/html
|
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%{_mandir}/man3/hbaapi.h.3*
|
||||||
|
%{_libdir}/%{name}.so
|
||||||
|
%exclude %{_libdir}/%{name}.la
|
||||||
|
%{_includedir}/hbaapi.h
|
||||||
|
|
||||||
%files docs
|
%files docs
|
||||||
%{_docdir}/%{name}/html
|
%{_docdir}/%{name}/html
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Nov 27 2019 Dan Horák <dan[at]danny.cz> - 2.2.0-2
|
* Tue Jun 10 2025 Dan Horák <dhorak@redhat.com> - 3.0.3-1
|
||||||
- fix scriptlets so they work correctly on upgrades
|
- updated to 3.0.3
|
||||||
- Resolves: #1765520
|
- Resolves: RHEL-62974
|
||||||
|
|
||||||
* Wed Mar 20 2019 Dan Horák <dhorak@redhat.com> - 2.2.0-1
|
* Thu Apr 14 2022 Dan Horák <dhorak@redhat.com> - 2.2.0-15
|
||||||
- updated to 2.2.0 - add port speed capabilities
|
- add devel subpackage (#2069642)
|
||||||
- Resolves: #1612775
|
- Resolves: #2069642
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* Thu May 27 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.2.0-13
|
||||||
|
- Rebuilt for sg3_utils 1.47 (#1955157)
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* Tue Feb 02 2021 Dan Horák <dan[at]danny.cz> - 2.2.0-10
|
||||||
|
- build with libzfcphbaapi as standalone library to avoid dependency on obsolete libhbaapi (#1922413)
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Nov 12 2020 Florian Weimer <fweimer@redhat.com> - 2.2.0-8
|
||||||
|
- Trigger rebuild to avoid DT_INIT/DT_FINI with zero values
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Apr 20 2020 Dan Horák <dan@danny.cz> - 2.2.0-6
|
||||||
|
- rebuilt for sg3_utils 1.45 (#1809392)
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Nov 27 2019 Dan Horák <dan[at]danny.cz> - 2.2.0-4
|
||||||
|
- fix scriptlets so they work correctly on upgrades
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Mar 8 2019 Tim Landscheidt <tim@tim-landscheidt.de> - 2.2.0-2
|
||||||
|
- Fix requirement for %%preun (instead of %%postun) scriptlet
|
||||||
|
|
||||||
|
* Thu Feb 28 2019 Dan Horák <dan[at]danny.cz> - 2.2.0-1
|
||||||
|
- updated to 2.2.0
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-8
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-8
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user