From f4be94993a6841f0dd2398906f01204c0d880477 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 06 2021 11:38:20 +0000 Subject: import libstoragemgmt-1.9.1-1.el8 --- diff --git a/.gitignore b/.gitignore index aff864d..3ac2853 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libstoragemgmt-1.8.7.tar.gz +SOURCES/libstoragemgmt-1.9.1.tar.gz diff --git a/.libstoragemgmt.metadata b/.libstoragemgmt.metadata index 73402dc..19f0deb 100644 --- a/.libstoragemgmt.metadata +++ b/.libstoragemgmt.metadata @@ -1 +1 @@ -8e916ae7bcbbe7b7a84499b834d34f39b1ae4db7 SOURCES/libstoragemgmt-1.8.7.tar.gz +77c03b4100a774cb15805f8a2782ad4754f87060 SOURCES/libstoragemgmt-1.9.1.tar.gz diff --git a/SPECS/libstoragemgmt.spec b/SPECS/libstoragemgmt.spec index 7cefddc..765c889 100644 --- a/SPECS/libstoragemgmt.spec +++ b/SPECS/libstoragemgmt.spec @@ -1,7 +1,7 @@ %bcond_with test Name: libstoragemgmt -Version: 1.8.7 +Version: 1.9.1 Release: 1%{?dist} Summary: Storage array management library Group: System Environment/Libraries @@ -9,10 +9,13 @@ 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 -Requires: python3-%{name} +Requires: python3-%{name}%{_isa} = %{version}-%{release} -# Netapp 7 mode plugin is no more. +# Packages that have been removed Obsoletes: %{name}-netapp-plugin <= 1.6.2-10 +Provides: %{name}-netapp-plugin <= 1.6.2-10 +Obsoletes: %{name}-nstor-plugin <= 1.9.0-1 +Provides: %{name}-nstor-plugin <= 1.9.0-1 BuildRequires: gcc gcc-c++ BuildRequires: autoconf automake libtool libxml2-devel check-devel perl-interpreter @@ -54,28 +57,22 @@ developing applications that use %{name}. %package -n python3-%{name} Summary: Python 3 client libraries and plug-in support for %{name} Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -BuildArch: noarch -Requires: python3-%{name}-clibs -# If the existing netapp plugin is installed, we need to meet it's requirement +Requires: %{name}%{?_isa} = %{version}-%{release} +# If obsoleted packages are installed, we need to meet it's requirement # of having the correct version of this package functionality installed too as # the update occurs first, before the obsolete removes the obsoleted package. -Provides: python3-%{name} = 1.6.2-9.el8 +Provides: python2-%{name}-clibs <= 1.9.0-1 +Obsoletes: python2-%{name}-clibs <= 1.9.0-1 + +Provides: python3-%{name}-clibs <= 1.9.0-1 +Obsoletes: python3-%{name}-clibs <= 1.9.0-1 + %{?python_provide:%python_provide python3-%{name}} %description -n python3-%{name} This contains python 3 client libraries as well as python framework support and open source plug-ins written in python 3. -%package -n python3-%{name}-clibs -Summary: Python 3 C extension module for %{name} -Group: System Environment/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -%{?python_provide:%python_provide python3-%{name}-clibs} - -%description -n python3-%{name}-clibs -This package contains python 3 client C extension libraries. - %package smis-plugin Summary: Files for SMI-S generic array support for %{name} Group: System Environment/Libraries @@ -105,19 +102,6 @@ BuildArch: noarch The %{name}-targetd-plugin package contains plug-in for targetd array support. - -%package nstor-plugin -Summary: Files for NexentaStor array support for %{name} -Group: System Environment/Libraries -Requires: python3-%{name} = %{version} -Requires(post): python3-%{name} = %{version} -Requires(postun): python3-%{name} = %{version} -BuildArch: noarch - -%description nstor-plugin -The %{name}-nstor-plugin package contains plug-in for NexentaStor array -support. - %package udev Summary: Udev files for %{name} Group: System Environment/Base @@ -166,37 +150,30 @@ Adaptec RAID and Smart Family Controller storage management. Summary: Files for NFS local filesystem support for %{name} Group: System Environment/Libraries Requires: python3-%{name} = %{version} -Requires: %{name}-nfs-plugin-clibs = %{version} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: nfs-utils +Obsoletes: %{name}-nfs-plugin-clibs <= 1.9.0-1 +Provides: %{name}-nfs-plugin-clibs <= 1.9.0-1 + Requires(post): python3-%{name} = %{version} Requires(postun): python3-%{name} = %{version} -BuildArch: noarch %description nfs-plugin The nfs-plugin package contains plug-in for local NFS exports support. -%package nfs-plugin-clibs -Summary: Python C extension module for %{name} NFS plugin -Group: System Environment/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description nfs-plugin-clibs -The %{name}-nfs-plugin-clibs package contains python C extension for %{name} -NFS plugin. - - %package local-plugin 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(post): python3-%{name} = %{version} Requires(postun): python3-%{name} = %{version} BuildArch: noarch %description local-plugin -The nfs-plugin package contains plug-in for local NFS exports support. -LibstorageMgmt local plugin allows user to manage locally storage system -without caring which real plugin(s) should be used. +The %{name}-local-plugin is a plugin that provides auto +plugin selection for locally managed storage. %prep %autosetup -p1 @@ -204,7 +181,7 @@ without caring which real plugin(s) should be used. %build ./autogen.sh -%configure PYTHON=%{__python3} --with-python3 --without-ontap --disable-static \ +%configure PYTHON=%{__python3} --with-python3 --disable-static \ %if %{without test} --without-test %endif @@ -232,7 +209,6 @@ pathfix.py -pni "%{__python3}" \ %{buildroot}/usr/bin/arcconf_lsmplugin \ %{buildroot}/usr/bin/targetd_lsmplugin \ %{buildroot}/usr/bin/sim_lsmplugin \ - %{buildroot}/usr/bin/nstor_lsmplugin \ %{buildroot}/usr/bin/megaraid_lsmplugin \ %{buildroot}/usr/bin/hpsa_lsmplugin \ %{buildroot}/usr/bin/local_lsmplugin \ @@ -294,19 +270,6 @@ if [ $1 -eq 0 ]; then fi # Need to restart lsmd if plugin is new installed or removed. -%post nstor-plugin -if [ $1 -eq 1 ]; then - # New install. - /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : -fi - -%postun nstor-plugin -if [ $1 -eq 0 ]; then - # Remove - /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : -fi - -# Need to restart lsmd if plugin is new installed or removed. %post megaraid-plugin if [ $1 -eq 1 ]; then # New install. @@ -398,81 +361,66 @@ fi %{_mandir}/man3/libstoragemgmt* %files -n python3-%{name} -%dir %{python3_sitelib}/lsm -%{python3_sitelib}/lsm/__init__.* -%dir %{python3_sitelib}/lsm/external -%{python3_sitelib}/lsm/external/* -%{python3_sitelib}/lsm/_client.* -%{python3_sitelib}/lsm/_common.* -%{python3_sitelib}/lsm/_local_disk.* -%{python3_sitelib}/lsm/_data.* -%{python3_sitelib}/lsm/_iplugin.* -%{python3_sitelib}/lsm/_pluginrunner.* -%{python3_sitelib}/lsm/_transport.* -%{python3_sitelib}/lsm/__pycache__/ -%{python3_sitelib}/lsm/version.* -%dir %{python3_sitelib}/lsm/plugin -%{python3_sitelib}/lsm/plugin/__init__.* -%{python3_sitelib}/lsm/plugin/__pycache__/ -%dir %{python3_sitelib}/lsm/plugin/sim -%{python3_sitelib}/lsm/plugin/sim/__pycache__/ -%{python3_sitelib}/lsm/plugin/sim/__init__.* -%{python3_sitelib}/lsm/plugin/sim/simulator.* -%{python3_sitelib}/lsm/plugin/sim/simarray.* -%dir %{python3_sitelib}/lsm/lsmcli -%{python3_sitelib}/lsm/lsmcli/__init__.* -%{python3_sitelib}/lsm/lsmcli/__pycache__/ -%{python3_sitelib}/lsm/lsmcli/data_display.* -%{python3_sitelib}/lsm/lsmcli/cmdline.* +%dir %{python3_sitearch}/lsm +%{python3_sitearch}/lsm/__init__.* +%{python3_sitearch}/lsm/_client.* +%{python3_sitearch}/lsm/_common.* +%{python3_sitearch}/lsm/_local_disk.* +%{python3_sitearch}/lsm/_data.* +%{python3_sitearch}/lsm/_iplugin.* +%{python3_sitearch}/lsm/_pluginrunner.* +%{python3_sitearch}/lsm/_transport.* +%{python3_sitearch}/lsm/__pycache__/ +%{python3_sitearch}/lsm/version.* +%dir %{python3_sitearch}/lsm/lsmcli +%{python3_sitearch}/lsm/lsmcli/__init__.* +%{python3_sitearch}/lsm/lsmcli/__pycache__/ +%{python3_sitearch}/lsm/lsmcli/data_display.* +%{python3_sitearch}/lsm/lsmcli/cmdline.* +%{python3_sitearch}/lsm/_clib.* + +%dir %{python3_sitearch}/sim_plugin +%{python3_sitearch}/sim_plugin/__pycache__/ +%{python3_sitearch}/sim_plugin/__init__.* +%{python3_sitearch}/sim_plugin/simulator.* +%{python3_sitearch}/sim_plugin/simarray.* + %{_bindir}/sim_lsmplugin %dir %{_libexecdir}/lsm.d -%{_libexecdir}/lsm.d/find_unused_lun.py -%{_libexecdir}/lsm.d/local_check.py -%{_sysconfdir}/lsm/pluginconf.d/sim.conf +%{_libexecdir}/lsm.d/find_unused_lun.py* +%{_libexecdir}/lsm.d/local_check.py* +%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/sim.conf %{_mandir}/man1/sim_lsmplugin.1* -%files -n python3-%{name}-clibs -%{python3_sitelib}/lsm/_clib.* - %files smis-plugin %defattr(-,root,root,-) -%dir %{python3_sitelib}/lsm/plugin/smispy -%dir %{python3_sitelib}/lsm/plugin/smispy/__pycache__ -%{python3_sitelib}/lsm/plugin/smispy/__pycache__/* -%{python3_sitelib}/lsm/plugin/smispy/__init__.* -%{python3_sitelib}/lsm/plugin/smispy/smis.* -%{python3_sitelib}/lsm/plugin/smispy/dmtf.* -%{python3_sitelib}/lsm/plugin/smispy/utils.* -%{python3_sitelib}/lsm/plugin/smispy/smis_common.* -%{python3_sitelib}/lsm/plugin/smispy/smis_cap.* -%{python3_sitelib}/lsm/plugin/smispy/smis_sys.* -%{python3_sitelib}/lsm/plugin/smispy/smis_pool.* -%{python3_sitelib}/lsm/plugin/smispy/smis_disk.* -%{python3_sitelib}/lsm/plugin/smispy/smis_vol.* -%{python3_sitelib}/lsm/plugin/smispy/smis_ag.* +%dir %{python3_sitelib}/smispy_plugin +%dir %{python3_sitelib}/smispy_plugin/__pycache__ +%{python3_sitelib}/smispy_plugin/__pycache__/* +%{python3_sitelib}/smispy_plugin/__init__.* +%{python3_sitelib}/smispy_plugin/smis.* +%{python3_sitelib}/smispy_plugin/dmtf.* +%{python3_sitelib}/smispy_plugin/utils.* +%{python3_sitelib}/smispy_plugin/smis_common.* +%{python3_sitelib}/smispy_plugin/smis_cap.* +%{python3_sitelib}/smispy_plugin/smis_sys.* +%{python3_sitelib}/smispy_plugin/smis_pool.* +%{python3_sitelib}/smispy_plugin/smis_disk.* +%{python3_sitelib}/smispy_plugin/smis_vol.* +%{python3_sitelib}/smispy_plugin/smis_ag.* %{_bindir}/smispy_lsmplugin %{_mandir}/man1/smispy_lsmplugin.1* %files targetd-plugin %defattr(-,root,root,-) -%dir %{python3_sitelib}/lsm/plugin/targetd -%dir %{python3_sitelib}/lsm/plugin/targetd/__pycache__ -%{python3_sitelib}/lsm/plugin/targetd/__pycache__/* -%{python3_sitelib}/lsm/plugin/targetd/__init__.* -%{python3_sitelib}/lsm/plugin/targetd/targetd.* +%dir %{python3_sitelib}/targetd_plugin +%dir %{python3_sitelib}/targetd_plugin/__pycache__ +%{python3_sitelib}/targetd_plugin/__pycache__/* +%{python3_sitelib}/targetd_plugin/__init__.* +%{python3_sitelib}/targetd_plugin/targetd.* %{_bindir}/targetd_lsmplugin %{_mandir}/man1/targetd_lsmplugin.1* -%files nstor-plugin -%defattr(-,root,root,-) -%dir %{python3_sitelib}/lsm/plugin/nstor -%dir %{python3_sitelib}/lsm/plugin/nstor/__pycache__ -%{python3_sitelib}/lsm/plugin/nstor/__pycache__/* -%{python3_sitelib}/lsm/plugin/nstor/__init__.* -%{python3_sitelib}/lsm/plugin/nstor/nstor.* -%{_bindir}/nstor_lsmplugin -%{_mandir}/man1/nstor_lsmplugin.1* - %files udev %defattr(-,root,root,-) %{_udevrulesdir}/../scan-scsi-target @@ -480,66 +428,74 @@ fi %files megaraid-plugin %defattr(-,root,root,-) -%dir %{python3_sitelib}/lsm/plugin/megaraid -%dir %{python3_sitelib}/lsm/plugin/megaraid/__pycache__ -%{python3_sitelib}/lsm/plugin/megaraid/__pycache__/* -%{python3_sitelib}/lsm/plugin/megaraid/__init__.* -%{python3_sitelib}/lsm/plugin/megaraid/megaraid.* -%{python3_sitelib}/lsm/plugin/megaraid/utils.* +%dir %{python3_sitelib}/megaraid_plugin +%dir %{python3_sitelib}/megaraid_plugin/__pycache__ +%{python3_sitelib}/megaraid_plugin/__pycache__/* +%{python3_sitelib}/megaraid_plugin/__init__.* +%{python3_sitelib}/megaraid_plugin/megaraid.* +%{python3_sitelib}/megaraid_plugin/utils.* %{_bindir}/megaraid_lsmplugin %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/megaraid.conf %{_mandir}/man1/megaraid_lsmplugin.1* %files hpsa-plugin %defattr(-,root,root,-) -%dir %{python3_sitelib}/lsm/plugin/hpsa -%dir %{python3_sitelib}/lsm/plugin/hpsa/__pycache__ -%{python3_sitelib}/lsm/plugin/hpsa/__pycache__/* -%{python3_sitelib}/lsm/plugin/hpsa/__init__.* -%{python3_sitelib}/lsm/plugin/hpsa/hpsa.* -%{python3_sitelib}/lsm/plugin/hpsa/utils.* +%dir %{python3_sitelib}/hpsa_plugin +%dir %{python3_sitelib}/hpsa_plugin/__pycache__ +%{python3_sitelib}/hpsa_plugin/__pycache__/* +%{python3_sitelib}/hpsa_plugin/__init__.* +%{python3_sitelib}/hpsa_plugin/hpsa.* +%{python3_sitelib}/hpsa_plugin/utils.* %{_bindir}/hpsa_lsmplugin %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/hpsa.conf %{_mandir}/man1/hpsa_lsmplugin.1* %files nfs-plugin %defattr(-,root,root,-) -%dir %{python3_sitelib}/lsm/plugin/nfs -%dir %{python3_sitelib}/lsm/plugin/nfs/__pycache__ -%{python3_sitelib}/lsm/plugin/nfs/__pycache__/* -%{python3_sitelib}/lsm/plugin/nfs/__init__.* -%{python3_sitelib}/lsm/plugin/nfs/nfs.* -%{_sysconfdir}/lsm/pluginconf.d/nfs.conf +%dir %{python3_sitearch}/nfs_plugin +%dir %{python3_sitearch}/nfs_plugin/__pycache__ +%{python3_sitearch}/nfs_plugin/__pycache__/* +%{python3_sitearch}/nfs_plugin/__init__.* +%{python3_sitearch}/nfs_plugin/nfs.* +%{python3_sitearch}/nfs_plugin/nfs_clib.* +%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/nfs.conf %{_bindir}/nfs_lsmplugin %{_mandir}/man1/nfs_lsmplugin.1* -%files nfs-plugin-clibs -%{python3_sitelib}/lsm/plugin/nfs/nfs_clib.* - %files arcconf-plugin %defattr(-,root,root,-) -%dir %{python3_sitelib}/lsm/plugin/arcconf -%dir %{python3_sitelib}/lsm/plugin/arcconf/__pycache__ -%{python3_sitelib}/lsm/plugin/arcconf/__pycache__/* -%{python3_sitelib}/lsm/plugin/arcconf/__init__.* -%{python3_sitelib}/lsm/plugin/arcconf/arcconf.* -%{python3_sitelib}/lsm/plugin/arcconf/utils.* +%dir %{python3_sitelib}/arcconf_plugin +%dir %{python3_sitelib}/arcconf_plugin/__pycache__ +%{python3_sitelib}/arcconf_plugin/__pycache__/* +%{python3_sitelib}/arcconf_plugin/__init__.* +%{python3_sitelib}/arcconf_plugin/arcconf.* +%{python3_sitelib}/arcconf_plugin/utils.* %{_bindir}/arcconf_lsmplugin %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/arcconf.conf %{_mandir}/man1/arcconf_lsmplugin.1* %files local-plugin %defattr(-,root,root,-) -%dir %{python3_sitelib}/lsm/plugin/local -%dir %{python3_sitelib}/lsm/plugin/local/__pycache__ -%{python3_sitelib}/lsm/plugin/local/__pycache__/* -%{python3_sitelib}/lsm/plugin/local/__init__.* -%{python3_sitelib}/lsm/plugin/local/local.* -%{_sysconfdir}/lsm/pluginconf.d/local.conf +%dir %{python3_sitelib}/local_plugin +%dir %{python3_sitelib}/local_plugin/__pycache__ +%{python3_sitelib}/local_plugin/__pycache__/* +%{python3_sitelib}/local_plugin/__init__.* +%{python3_sitelib}/local_plugin/local.* +%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/local.conf %{_bindir}/local_lsmplugin %{_mandir}/man1/local_lsmplugin.1* %changelog +* Tue Apr 20 2021 Tony Asleson - 1.9.1-1 +- Upgrade to 1.9.1 + +* Wed Apr 14 2021 Tony Asleson - 1.9.0-2 +- Re-order dependencies +- Correct multi-lib issue with python simulator files location + +* Tue Mar 30 2021 Tony Asleson - 1.9.0-1 +- Upgrade to 1.9.0 (RHBZ #1939191) + * Thu Dec 3 2020 Tony Asleson - 1.8.7-1 - Upgrade to 1.8.7 (RHBZ #1817117)