diff --git a/.gitignore b/.gitignore index ba4c187..fa4836f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libstoragemgmt-1.7.3.tar.gz +SOURCES/libstoragemgmt-1.8.1.tar.gz diff --git a/.libstoragemgmt.metadata b/.libstoragemgmt.metadata index f83b1a9..a047dad 100644 --- a/.libstoragemgmt.metadata +++ b/.libstoragemgmt.metadata @@ -1 +1 @@ -f4831f2a90f180583a55ac3effc7bde37720ab34 SOURCES/libstoragemgmt-1.7.3.tar.gz +7795ddffe993e06a4bbe62617ed43a7a1b131cbb SOURCES/libstoragemgmt-1.8.1.tar.gz diff --git a/SPECS/libstoragemgmt.spec b/SPECS/libstoragemgmt.spec index 08d002c..27912a4 100644 --- a/SPECS/libstoragemgmt.spec +++ b/SPECS/libstoragemgmt.spec @@ -3,8 +3,8 @@ %endif Name: libstoragemgmt -Version: 1.7.3 -Release: 3%{?dist} +Version: 1.8.1 +Release: 1%{?dist} Summary: Storage array management library Group: System Environment/Libraries License: LGPLv2+ @@ -12,6 +12,10 @@ URL: https://github.com/libstorage/libstoragemgmt Source0: https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-python + +# Netapp 7 mode plugin is no more. +Obsoletes: %{name}-netapp-plugin + BuildRequires: autoconf automake libtool yajl-devel libxml2-devel check-devel perl BuildRequires: openssl-devel BuildRequires: python-argparse @@ -84,22 +88,6 @@ BuildArch: noarch The %{name}-smis-plugin package contains plug-in for generic SMI-S array support. - -%package netapp-plugin -Summary: Files for NetApp array support for %{name} -Group: System Environment/Libraries -BuildRequires: m2crypto -Requires: m2crypto -Requires: %{name}-python = %{version}-%{release} -Requires(post): %{name}-python = %{version}-%{release} -Requires(postun): %{name}-python = %{version}-%{release} -BuildArch: noarch - -%description netapp-plugin -The %{name}-netapp-plugin package contains plug-in for NetApp array -support. - - %package targetd-plugin Summary: Files for targetd array support for %{name} Group: System Environment/Libraries @@ -192,6 +180,7 @@ Requires: %{name} = %{version}-%{release} 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 @@ -205,6 +194,7 @@ Requires: %{name}-hpsa-plugin = %{version}-%{release} 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. @@ -219,7 +209,7 @@ without caring which real plugin(s) should be used. ./autogen.sh #Tell the install program to preserve file date/timestamps -%configure --disable-static --with-yajl \ +%configure --disable-static --with-yajl --without-ontap \ %if 0%{?skip_mem_check} == 1 --without-mem-leak-test %endif @@ -284,18 +274,6 @@ if [ $1 -eq 0 ]; then /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : fi -%post netapp-plugin -if [ $1 -eq 1 ]; then - # New install. - /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : -fi - -%postun netapp-plugin -if [ $1 -eq 0 ]; then - # Remove - /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : -fi - %post targetd-plugin if [ $1 -eq 1 ]; then # New install. @@ -325,7 +303,6 @@ if [ $1 -eq 1 ]; then # New install. /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : fi - %postun megaraid-plugin if [ $1 -eq 0 ]; then # Remove @@ -337,7 +314,6 @@ if [ $1 -eq 1 ]; then # New install. /usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : fi - %postun hpsa-plugin if [ $1 -eq 0 ]; then # Remove @@ -471,15 +447,6 @@ fi %{_bindir}/smispy_lsmplugin %{_mandir}/man1/smispy_lsmplugin.1* -%files netapp-plugin -%defattr(-,root,root,-) -%dir %{python_sitelib}/lsm/plugin/ontap -%{python_sitelib}/lsm/plugin/ontap/__init__.* -%{python_sitelib}/lsm/plugin/ontap/na.* -%{python_sitelib}/lsm/plugin/ontap/ontap.* -%{_bindir}/ontap_lsmplugin -%{_mandir}/man1/ontap_lsmplugin.1* - %files targetd-plugin %defattr(-,root,root,-) %dir %{python_sitelib}/lsm/plugin/targetd @@ -553,6 +520,10 @@ fi %{_mandir}/man1/local_lsmplugin.1* %changelog +* Tue Aug 13 2019 Tony Asleson - 1.8.1-1 +- Upgrade to 1.8.1 +- Obsolete the netapp plugin. + * Thu Mar 28 2019 Tony Asleson - 1.7.3-3 * https://bugzilla.redhat.com/show_bug.cgi?id=1693678