Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/libzfcphbaapi.git#9912e2d7ac40945c931cda0dad48cbd5cc450714
This commit is contained in:
DistroBaker 2021-02-07 01:53:43 +00:00
parent 910d017210
commit 8dcde13075

View File

@ -3,7 +3,7 @@
Name: libzfcphbaapi
Summary: HBA API for the zFCP device driver
Version: 2.2.0
Release: 9%{?dist}
Release: 10%{?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
@ -17,14 +17,8 @@ BuildRequires: automake
BuildRequires: doxygen
BuildRequires: libsysfs-devel
BuildRequires: sg3_utils-devel
BuildRequires: libhbaapi-devel
BuildRequires: make
Requires: libhbaapi
BuildRequires: make
Requires(post): grep sed
Requires(postun): grep sed
# exclude plugin soname from Provides
%global __provides_exclude ^(libzfcphbaapi-%{version}[.]so.*)$
%description
zFCP HBA API Library is an implementation of FC-HBA (see www.t11.org) for
@ -36,8 +30,6 @@ License: CPL
Summary: zFCP HBA API Library -- Documentation
URL: http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi.html
Requires: %{name} = %{version}-%{release}
Provides: s390utils-libzfcphbaapi-docs = 2:1.20.0-4
Obsoletes: s390utils-libzfcphbaapi-docs <= 2:1.20.0-3
%description docs
Documentation for the zFCP HBA API Library.
@ -50,33 +42,22 @@ Documentation for the zFCP HBA API Library.
%build
%configure --disable-static --enable-vendor-lib
make EXTRA_CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%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"
%install
%makeinstall docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}
%makeinstall docdir=%{buildroot}%{_docdir}/%{name}
# keep only html docs
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/latex
# remove unwanted files
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.*
rm -rf %{buildroot}%{_docdir}/%{name}/latex
%post
# remove old entry from hba.conf on upgrade
if [ $1 == 2 ]; 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
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
@ -87,7 +68,7 @@ fi
%doc README COPYING ChangeLog AUTHORS LICENSE
%{_bindir}/zfcp_ping
%{_bindir}/zfcp_show
%{_libdir}/%{name}-%{version}.so
%{_libdir}/%{name}.so.*
%{_mandir}/man3/libzfcphbaapi.3*
%{_mandir}/man3/SupportedHBAAPIs.3*
%{_mandir}/man3/UnSupportedHBAAPIs.3*
@ -95,6 +76,9 @@ fi
%{_mandir}/man8/zfcp_show.8*
%exclude %{_mandir}/man3/hbaapi.h.3*
%exclude %{_docdir}/%{name}/html
%exclude %{_libdir}/%{name}.so
%exclude %{_libdir}/%{name}.la
%exclude %{_includedir}/hbaapi.h
%files docs
@ -102,6 +86,9 @@ fi
%changelog
* 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