diff --git a/SOURCES/BZ_2018657_correct_raid10_info.patch b/SOURCES/BZ_2018657_correct_raid10_info.patch new file mode 100644 index 0000000..39e69fa --- /dev/null +++ b/SOURCES/BZ_2018657_correct_raid10_info.patch @@ -0,0 +1,13 @@ +diff --git a/plugin/megaraid_plugin/megaraid.py b/plugin/megaraid_plugin/megaraid.py +index 748bdba..0210235 100644 +--- a/plugin/megaraid_plugin/megaraid.py ++++ b/plugin/megaraid_plugin/megaraid.py +@@ -791,7 +791,7 @@ def volume_raid_info(self, volume, flags=Client.FLAG_RSVD): + int(vd_prop_info['Span Depth'])) + elif raid_type == Volume.RAID_TYPE_RAID10: + strip_count = ( +- int(vd_prop_info['Number of Drives Per Span']) / 2 * ++ int_div(int(vd_prop_info['Number of Drives Per Span']), 2) * + int(vd_prop_info['Span Depth'])) + else: + # MegaRAID does not support 15 or 16 yet. diff --git a/SPECS/libstoragemgmt.spec b/SPECS/libstoragemgmt.spec index 765c889..23a85fb 100644 --- a/SPECS/libstoragemgmt.spec +++ b/SPECS/libstoragemgmt.spec @@ -2,13 +2,14 @@ Name: libstoragemgmt Version: 1.9.1 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Storage array management library Group: System Environment/Libraries License: LGPLv2+ URL: https://github.com/libstorage/libstoragemgmt Source0: https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz Patch0: BZ_1710776_change_run_dir.patch +Patch1: BZ_2018657_correct_raid10_info.patch Requires: python3-%{name}%{_isa} = %{version}-%{release} # Packages that have been removed @@ -79,7 +80,7 @@ Group: System Environment/Libraries BuildRequires: python3-pywbem Requires: python3-pywbem BuildArch: noarch -Provides: %{name}-ibm-v7k-plugin = 2:%{version}-%{release} +Provides: %{name}-ibm-v7k-plugin <= 2:1.9.1-1 Obsoletes: %{name}-ibm-v7k-plugin <= 2:0.1.0-3 Requires: python3-%{name} = %{version} Requires(post): python3-%{name} = %{version} @@ -165,8 +166,8 @@ The nfs-plugin package contains plug-in for local NFS exports support. Summary: Files for local pseudo plugin of %{name} Group: System Environment/Libraries Requires: python3-%{name} = %{version} -Requires: %{name}-arcconf-plugin = %{version} -Requires: %{name}-hpsa-plugin = %{version} +Requires: %{name}-arcconf-plugin = %{version}-%{release} +Requires: %{name}-hpsa-plugin = %{version}-%{release} Requires(post): python3-%{name} = %{version} Requires(postun): python3-%{name} = %{version} BuildArch: noarch @@ -486,6 +487,13 @@ fi %{_mandir}/man1/local_lsmplugin.1* %changelog +* Fri Nov 12 2021 Tony Asleson - 1.9.1-3 +- Correct rpmdiff warnings +- RHBZ #2018657 + +* Tue Nov 9 2021 Tony Asleson - 1.9.1-2 +- Correct megaraid raid info (RHBZ #2018657) + * Tue Apr 20 2021 Tony Asleson - 1.9.1-1 - Upgrade to 1.9.1