Update to release 1.3.1
Note: Fixed some rpmlint warnings too Signed-off-by: Tony Asleson <tasleson@redhat.com>
This commit is contained in:
Tony Asleson
parent
310311f669
commit
7ea924b158
1
.gitignore
vendored
1
.gitignore
vendored
@ -17,3 +17,4 @@
|
||||
/libstoragemgmt-1.1.0.tar.gz
|
||||
/libstoragemgmt-1.2.1.tar.gz
|
||||
/libstoragemgmt-1.2.3.tar.gz
|
||||
/libstoragemgmt-1.3.1.tar.gz
|
||||
|
||||
@ -1,11 +1,8 @@
|
||||
%bcond_with rest_api
|
||||
%bcond_without megaraid
|
||||
%bcond_without hpsa
|
||||
%bcond_without test
|
||||
|
||||
Name: libstoragemgmt
|
||||
Version: 1.2.3
|
||||
Release: 2%{?dist}
|
||||
Version: 1.3.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Storage array management library
|
||||
Group: System Environment/Libraries
|
||||
License: LGPLv2+
|
||||
@ -20,11 +17,19 @@ BuildRequires: glib2-devel
|
||||
BuildRequires: systemd
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: libconfig-devel
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: procps
|
||||
|
||||
Requires: initscripts
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: valgrind
|
||||
BuildRequires: python-pyudev
|
||||
|
||||
%description
|
||||
The libStorageMgmt library will provide a vendor agnostic open source storage
|
||||
application programming interface (API) that will allow management of storage
|
||||
@ -45,12 +50,22 @@ developing applications that use %{name}.
|
||||
Summary: Python client libraries and plug-in support for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: python-argparse
|
||||
Requires: %{name}-python-clibs
|
||||
BuildArch: noarch
|
||||
|
||||
%description python
|
||||
The %{name}-python package contains python client libraries as
|
||||
well as python framework support and open source plug-ins written in python.
|
||||
|
||||
%package python-clibs
|
||||
Summary: Python C extension module for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description python-clibs
|
||||
The %{name}-python-clibs package contains python client C extension
|
||||
libraries.
|
||||
|
||||
%package smis-plugin
|
||||
Summary: Files for SMI-S generic array support for %{name}
|
||||
@ -119,21 +134,6 @@ Group: System Environment/Base
|
||||
The %{name}-udev package contains udev rules and helper utilities for
|
||||
uevents generated by the kernel.
|
||||
|
||||
%if 0%{with rest_api}
|
||||
%package rest
|
||||
Summary: REST API daemon for %{name}
|
||||
Group: System Environment/Daemons
|
||||
Requires: %{name}%{?_isa} = %{version}
|
||||
Requires(post): %{name} = %{version}
|
||||
Requires(postun): %{name} = %{version}
|
||||
Requires: libmicrohttpd json-c
|
||||
BuildRequires: libmicrohttpd-devel json-c-devel
|
||||
|
||||
%description rest
|
||||
the %{name}-rest package contains the http daemon for %{name} rest api.
|
||||
%endif
|
||||
|
||||
%if 0%{with megaraid}
|
||||
%package megaraid-plugin
|
||||
Summary: Files for LSI MegaRAID support for %{name}
|
||||
Group: System Environment/Libraries
|
||||
@ -145,13 +145,12 @@ BuildArch: noarch
|
||||
%description megaraid-plugin
|
||||
The %{name}-megaraid-plugin package contains the plugin for LSI
|
||||
MegaRAID storage management via storcli.
|
||||
%endif
|
||||
|
||||
%if 0%{with hpsa}
|
||||
%package hpsa-plugin
|
||||
Summary: Files for HP SmartArray support for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}-python = %{version}
|
||||
Requires: python-pyudev
|
||||
Requires(post): %{name}-python = %{version}
|
||||
Requires(postun): %{name}-python = %{version}
|
||||
BuildArch: noarch
|
||||
@ -159,19 +158,12 @@ BuildArch: noarch
|
||||
%description hpsa-plugin
|
||||
The %{name}-hpsa-plugin package contains the plugin for HP
|
||||
SmartArray storage management via hpssacli.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
%configure \
|
||||
%if ! 0%{with rest_api}
|
||||
--without-rest-api \
|
||||
%endif
|
||||
%{?_without_megaraid} \
|
||||
%{?_without_hpsa} \
|
||||
--disable-static
|
||||
%configure --disable-static
|
||||
|
||||
V=1 make %{?_smp_mflags}
|
||||
|
||||
@ -203,7 +195,7 @@ rm -rf %{buildroot}
|
||||
%check
|
||||
if ! make check
|
||||
then
|
||||
cat test/test-suite.log || true
|
||||
cat test-suite.log || true
|
||||
exit 1
|
||||
fi
|
||||
%endif
|
||||
@ -220,15 +212,6 @@ getent passwd libstoragemgmt >/dev/null || \
|
||||
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
|
||||
%systemd_post %{name}.service
|
||||
|
||||
|
||||
%if 0%{with rest_api}
|
||||
%preun rest
|
||||
%systemd_preun %{name}-rest.service
|
||||
|
||||
%postun rest
|
||||
%systemd_postun %{name}-rest.service
|
||||
%endif
|
||||
|
||||
%preun
|
||||
%systemd_preun %{name}.service
|
||||
|
||||
@ -288,7 +271,6 @@ if [ $1 -eq 0 ]; then
|
||||
/usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%if 0%{with megaraid}
|
||||
# Need to restart lsmd if plugin is new installed or removed.
|
||||
%post megaraid-plugin
|
||||
if [ $1 -eq 1 ]; then
|
||||
@ -300,9 +282,7 @@ if [ $1 -eq 0 ]; then
|
||||
# Remove
|
||||
/usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
%endif
|
||||
|
||||
%if 0%{with hpsa}
|
||||
# Need to restart lsmd if plugin is new installed or removed.
|
||||
%post hpsa-plugin
|
||||
if [ $1 -eq 1 ]; then
|
||||
@ -314,7 +294,6 @@ if [ $1 -eq 0 ]; then
|
||||
# Remove
|
||||
/usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
@ -354,6 +333,7 @@ fi
|
||||
%{python_sitelib}/lsm/external/*
|
||||
%{python_sitelib}/lsm/_client.*
|
||||
%{python_sitelib}/lsm/_common.*
|
||||
%{python_sitelib}/lsm/_local_disk.*
|
||||
%{python_sitelib}/lsm/_data.*
|
||||
%{python_sitelib}/lsm/_iplugin.*
|
||||
%{python_sitelib}/lsm/_pluginrunner.*
|
||||
@ -373,6 +353,10 @@ fi
|
||||
%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/sim.conf
|
||||
%{_mandir}/man1/sim_lsmplugin.1*
|
||||
|
||||
# Compiled C files for python library
|
||||
%files python-clibs
|
||||
%{python_sitelib}/lsm/_clib.*
|
||||
|
||||
%files smis-plugin
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{python_sitelib}/lsm/plugin/smispy
|
||||
@ -420,14 +404,6 @@ fi
|
||||
%{_udevrulesdir}/../scan-scsi-target
|
||||
%{_udevrulesdir}/90-scsi-ua.rules
|
||||
|
||||
%if 0%{with rest_api}
|
||||
%files rest
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/lsm_restd
|
||||
%{_unitdir}/%{name}-rest.service
|
||||
%endif
|
||||
|
||||
%if 0%{with megaraid}
|
||||
%files megaraid-plugin
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{python_sitelib}/lsm/plugin/megaraid
|
||||
@ -437,9 +413,7 @@ fi
|
||||
%{_bindir}/megaraid_lsmplugin
|
||||
%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/megaraid.conf
|
||||
%{_mandir}/man1/megaraid_lsmplugin.1*
|
||||
%endif
|
||||
|
||||
%if 0%{with hpsa}
|
||||
%files hpsa-plugin
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{python_sitelib}/lsm/plugin/hpsa
|
||||
@ -449,9 +423,11 @@ fi
|
||||
%{_bindir}/hpsa_lsmplugin
|
||||
%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/hpsa.conf
|
||||
%{_mandir}/man1/hpsa_lsmplugin.1*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri May 13 2016 Tony Asleson <tasleson@redhat.com> 1.3.1-1
|
||||
- New upstream release 1.3.1
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
@ -484,14 +460,14 @@ fi
|
||||
Don't compile hpsa plugin.
|
||||
- Remove PyYAML BuildRequires.
|
||||
- Add NEWS(changelog) to document folder.
|
||||
- Replace the hardcoded udev path with %{_udevrulesdir}.
|
||||
- Replace the hardcoded udev path with <percent>{_udevrulesdir}.
|
||||
- Fix rpmlint error 'dir-or-file-in-var-run'.
|
||||
- Mark /run/lsm and /run/lsm/ipc as %ghost folder.
|
||||
- Mark /run/lsm and /run/lsm/ipc as <percent>ghost folder.
|
||||
- Fix rpmlint warnning 'W: non-standard-uid /run/lsm libstoragemgmt'.
|
||||
- Add 'Requires(post)' and 'Requires(postun)' to plugins in order
|
||||
to make sure plugin is installed after libstoragemgmt and removed before
|
||||
libstoragemgmt.
|
||||
- Fix the incorrect use of %bcond_with and %bcond_without.
|
||||
- Fix the incorrect use of <percent>bcond_with and <percent>bcond_without.
|
||||
- Removed autogen.sh which is not required for release version any more.
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user