Accepting request 454102 from home:jengelh:branches:Base:System

- Adjust rpm group categories to match what is used in other
  packages.
- Avoid suppressing error outputs in scriptlets. If it happens,
  we want to know about it.

OBS-URL: https://build.opensuse.org/request/show/454102
OBS-URL: https://build.opensuse.org/package/show/Base:System/libstoragemgmt?expand=0&rev=28
This commit is contained in:
Martin Pluskal 2017-02-02 09:54:01 +00:00 committed by Git OBS Bridge
parent 90f2cf2dd4
commit 85fc21ab24
2 changed files with 46 additions and 37 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Nov 27 21:06:22 UTC 2016 - jengelh@inai.de
- Adjust rpm group categories to match what is used in other
packages.
- Avoid suppressing error outputs in scriptlets. If it happens,
we want to know about it.
-------------------------------------------------------------------
Tue Aug 9 08:18:33 UTC 2016 - mpluskal@suse.com

View File

@ -24,7 +24,7 @@ Version: 1.3.4
Release: 0
Summary: Storage array management library
License: LGPL-2.1+
Group: System Environment/Libraries
Group: System/Libraries
Url: https://github.com/libstorage/libstoragemgmt
Source0: https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz
BuildRequires: fdupes
@ -71,7 +71,7 @@ executing plug-ins in a separate process (lsmd).
%package -n %{libname}
Summary: Storage array management library
Group: System Environment/Libraries
Group: System/Libraries
%description -n %{libname}
The libStorageMgmt library will provide a vendor agnostic open source storage
@ -82,7 +82,7 @@ executing plug-ins in a separate process (lsmd).
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Group: Development/Libraries/C and C++
Requires: %{libname} = %{version}
%description devel
@ -91,7 +91,7 @@ developing applications that use %{name}.
%package -n python-%{name}
Summary: Python client libraries and plug-in support for %{name}
Group: System Environment/Libraries
Group: System/Libraries
Requires: %{name} = %{version}
Requires: python-%{name}-clibs
Requires: python-argparse
@ -104,7 +104,7 @@ well as python framework support and open source plug-ins written in python.
%package -n python-%{name}-clibs
Summary: Python C extension for %{name}
Group: System Environment/Libraries
Group: System/Libraries
Requires: %{name} = %{version}
%py_requires
@ -113,7 +113,7 @@ The python-%{name}-clibs package contains python C extentions for %{name}.
%package smis-plugin
Summary: Files for SMI-S generic array support for %{name}
Group: System Environment/Libraries
Group: System/Libraries
Requires(post): %{name} = %{version}
Requires(postun): %{name} = %{version}
Requires: python-pywbem
@ -126,7 +126,7 @@ array support.
%package netapp-plugin
Summary: Files for NetApp array support for %{name}
Group: System Environment/Libraries
Group: System/Libraries
Requires(post): %{name} = %{version}
Requires(postun): %{name} = %{version}
Requires: python-M2Crypto
@ -139,7 +139,7 @@ support.
%package targetd-plugin
Summary: Files for targetd array support for %{name}
Group: System Environment/Libraries
Group: System/Libraries
Requires(post): %{name} = %{version}
Requires(postun): %{name} = %{version}
BuildArch: noarch
@ -151,7 +151,7 @@ array support.
%package nstor-plugin
Summary: Files for NexentaStor array support for %{name}
Group: System Environment/Libraries
Group: System/Libraries
Requires(post): %{name} = %{version}
Requires(postun): %{name} = %{version}
BuildArch: noarch
@ -163,7 +163,7 @@ array support.
%package udev
Summary: Udev files for %{name}
Group: System Environment/Base
Group: System/Base
%description udev
The %{name}-udev package contains udev rules and helper utilities for
@ -171,7 +171,7 @@ uevents generated by the kernel.
%package megaraid-plugin
Summary: Files for LSI MegaRAID support for %{name}
Group: System Environment/Libraries
Group: System/Libraries
Requires(post): %{name} = %{version}
Requires(postun): %{name} = %{version}
BuildArch: noarch
@ -182,7 +182,7 @@ storage management via storcli.
%package hpsa-plugin
Summary: Files for HP SmartArray support for %{name}
Group: System Environment/Libraries
Group: System/Libraries
Requires(post): %{name} = %{version}
Requires(postun): %{name} = %{version}
BuildArch: noarch
@ -255,9 +255,9 @@ fi
%post
%service_add_post %{name}.service
# Create tmp socket file on package new install.
if [ $1 -eq 1 ]; then
if [ $1 -eq 1 -a -x /usr/bin/systemd-tmpfiles ]; then
%if 0%{?suse_version} <= 1320
systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf >/dev/null 2>&1 || :
systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf || :
%else
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
%endif
@ -272,85 +272,85 @@ fi
%post smis-plugin
if [ $1 -eq 1 ]; then
# New install.
/usr/bin/systemctl try-restart ${name}.service >/dev/null 2>&1 || :
/usr/bin/systemctl try-restart ${name}.service || :
fi
%postun smis-plugin
if [ $1 -eq 0 ]; then
# Remove
/usr/bin/systemctl try-restart ${name}.service >/dev/null 2>&1 || :
/usr/bin/systemctl try-restart ${name}.service || :
fi
# Need to restart lsmd if plugin is new installed or removed.
%post netapp-plugin
if [ $1 -eq 1 ]; then
# New install.
/usr/bin/systemctl try-restart ${name}.service >/dev/null 2>&1 || :
/usr/bin/systemctl try-restart ${name}.service || :
fi
%postun netapp-plugin
if [ $1 -eq 0 ]; then
# Remove
/usr/bin/systemctl try-restart ${name}.service >/dev/null 2>&1 || :
/usr/bin/systemctl try-restart ${name}.service || :
fi
# Need to restart lsmd if plugin is new installed or removed.
%post targetd-plugin
if [ $1 -eq 1 ]; then
# New install.
/usr/bin/systemctl try-restart ${name}.service >/dev/null 2>&1 || :
/usr/bin/systemctl try-restart ${name}.service || :
fi
%postun targetd-plugin
if [ $1 -eq 0 ]; then
# Remove
/usr/bin/systemctl try-restart ${name}.service >/dev/null 2>&1 || :
/usr/bin/systemctl try-restart ${name}.service || :
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 || :
/usr/bin/systemctl try-restart ${name}.service || :
fi
%postun nstor-plugin
if [ $1 -eq 0 ]; then
# Remove
/usr/bin/systemctl try-restart ${name}.service >/dev/null 2>&1 || :
/usr/bin/systemctl try-restart ${name}.service || :
fi
# Need to restart lsmd if plugin is new installed or removed.
%post megaraid-plugin
if [ $1 -eq 1 ]; then
# New install.
/usr/bin/systemctl try-restart ${name}.service >/dev/null 2>&1 || :
/usr/bin/systemctl try-restart ${name}.service || :
fi
%postun megaraid-plugin
if [ $1 -eq 0 ]; then
# Remove
/usr/bin/systemctl try-restart ${name}.service >/dev/null 2>&1 || :
/usr/bin/systemctl try-restart ${name}.service || :
fi
# Need to restart lsmd if plugin is new installed or removed.
%post hpsa-plugin
if [ $1 -eq 1 ]; then
# New install.
/usr/bin/systemctl try-restart ${name}.service >/dev/null 2>&1 || :
/usr/bin/systemctl try-restart ${name}.service || :
fi
%postun hpsa-plugin
if [ $1 -eq 0 ]; then
# Remove
/usr/bin/systemctl try-restart ${name}.service >/dev/null 2>&1 || :
/usr/bin/systemctl try-restart ${name}.service || :
fi
%post udev
%udev_rules_update
%files
%defattr(-,root,root,-)
%defattr(-,root,root)
%{_mandir}/man1/lsmcli.1%{ext_man}
%{_mandir}/man1/lsmd.1%{ext_man}
%{_mandir}/man5/lsmd.conf.5*
@ -369,23 +369,23 @@ fi
%ghost /run/lsm/ipc
%files udev
%defattr(-,root,root,-)
%defattr(-,root,root)
%{_libexecdir}/udev/scan-scsi-target
%{_udevrulesdir}/90-scsi-ua.rules
%files -n %{libname}
%defattr(-,root,root,-)
%defattr(-,root,root)
%doc README COPYING.LIB
%{_libdir}/libstoragemgmt.so.*
%files devel
%defattr(-,root,root,-)
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/libstoragemgmt.so
%{_libdir}/pkgconfig/libstoragemgmt.pc
%files -n python-%{name}
%defattr(-,root,root,-)
%defattr(-,root,root)
%dir %{python_sitelib}/lsm
%{python_sitelib}/lsm/external
%{python_sitelib}/lsm/_*.py*
@ -400,35 +400,35 @@ fi
%{_mandir}/man1/sim_lsmplugin.1%{ext_man}
%files smis-plugin
%defattr(-,root,root,-)
%defattr(-,root,root)
%dir %{python_sitelib}/lsm/plugin/smispy
%{python_sitelib}/lsm/plugin/smispy/*.py*
%{_bindir}/smispy_lsmplugin
%{_mandir}/man1/smispy_lsmplugin.1%{ext_man}
%files netapp-plugin
%defattr(-,root,root,-)
%defattr(-,root,root)
%dir %{python_sitelib}/lsm/plugin/ontap
%{python_sitelib}/lsm/plugin/ontap/*.py*
%{_bindir}/ontap_lsmplugin
%{_mandir}/man1/ontap_lsmplugin.1%{ext_man}
%files targetd-plugin
%defattr(-,root,root,-)
%defattr(-,root,root)
%dir %{python_sitelib}/lsm/plugin/targetd
%{python_sitelib}/lsm/plugin/targetd/*.py*
%{_bindir}/targetd_lsmplugin
%{_mandir}/man1/targetd_lsmplugin.1%{ext_man}
%files nstor-plugin
%defattr(-,root,root,-)
%defattr(-,root,root)
%dir %{python_sitelib}/lsm/plugin/nstor
%{python_sitelib}/lsm/plugin/nstor/*.py*
%{_bindir}/nstor_lsmplugin
%{_mandir}/man1/nstor_lsmplugin.1%{ext_man}
%files megaraid-plugin
%defattr(-,root,root,-)
%defattr(-,root,root)
%dir %{python_sitelib}/lsm/plugin/megaraid
%{python_sitelib}/lsm/plugin/megaraid/*.py*
%{_bindir}/megaraid_lsmplugin
@ -436,7 +436,7 @@ fi
%{_mandir}/man1/megaraid_lsmplugin.1%{ext_man}
%files hpsa-plugin
%defattr(-,root,root,-)
%defattr(-,root,root)
%dir %{python_sitelib}/lsm/plugin/hpsa
%{python_sitelib}/lsm/plugin/hpsa/*.py*
%{_bindir}/hpsa_lsmplugin
@ -444,6 +444,7 @@ fi
%{_mandir}/man1/hpsa_lsmplugin.1%{ext_man}
%files -n python-%{name}-clibs
%defattr(-,root,root)
%{python_sitelib}/lsm/_clib.*
%changelog