rpms/libstoragemgmt
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import libstoragemgmt-1.8.1-2.el8

Browse Source
This commit is contained in:
CentOS Sources 2019-11-05 16:28:25 -05:00 committed by Andrew Lukoshko
parent 8e855d87ce
commit c60f58ff67
7 changed files with 40 additions and 19987 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/libstoragemgmt-1.6.2.tar.gz
SOURCES/libstoragemgmt-1.8.1.tar.gz

2
.libstoragemgmt.metadata
View File

@ -1 +1 @@
27b43886ace3ad8c98f91d9c4c0c7e544f4c85c5 SOURCES/libstoragemgmt-1.6.2.tar.gz
7795ddffe993e06a4bbe62617ed43a7a1b131cbb SOURCES/libstoragemgmt-1.8.1.tar.gz

19903
SOURCES/BZ_1560205_remove_yajl_dep.patch
View File

File diff suppressed because it is too large Load Diff

26
SOURCES/BZ_1612755_lsm_fix_lsmd_conf_manpage.patch
View File

@ -1,26 +0,0 @@
From a09fdf5b3dc642d09f5f68281249db785e04ea7f Mon Sep 17 00:00:00 2001
From: Gris Ge <fge@redhat.com>
Date: Tue, 25 Sep 2018 10:45:37 +0800
Subject: [PATCH] Manpage: Fix the incorrect path of lsmd.conf(5).
Currently, the installed manpage of lsmd.conf is `lsmd.conf.5.5.gz`.
This patch fixed it.
Signed-off-by: Gris Ge <fge@redhat.com>
---
doc/man/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index db9ffb5..5989505 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -25,4 +25,4 @@ if WITH_LOCAL
notrans_dist_man1_MANS += local_lsmplugin.1
endif
-notrans_dist_man5_MANS = lsmd.conf.5.in
+notrans_dist_man5_MANS = lsmd.conf.5
--
1.8.3.1

10
SOURCES/BZ_1623506_lsm_fix_fhs.patch
View File

@ -1,10 +0,0 @@
diff -Nur libstoragemgmt-1.6.2_old/tools/Makefile.am libstoragemgmt-1.6.2/tools/Makefile.am
--- libstoragemgmt-1.6.2_old/tools/Makefile.am 2018-05-18 16:10:52.000000000 +0800
+++ libstoragemgmt-1.6.2/tools/Makefile.am 2018-09-03 21:04:01.941559778 +0800
@@ -4,5 +4,5 @@
EXTRA_DIST=use_cases/find_unused_lun.py
-lsm_bindir=$(bindir)/lsm.d
+lsm_bindir=$(libexecdir)/lsm.d
lsm_bin_DATA=sanity_check/local_sanity_check.py use_cases/find_unused_lun.py

9
SOURCES/BZ_1710776_change_run_dir.patch Normal file
View File

@ -0,0 +1,9 @@
diff --git a/packaging/daemon/libstoragemgmt.conf b/packaging/daemon/libstoragemgmt.conf
index 1c118a9..cdb43c2 100644
--- a/packaging/daemon/libstoragemgmt.conf
+++ b/packaging/daemon/libstoragemgmt.conf
@@ -1,2 +1,2 @@
-D /var/run/lsm 0775 root libstoragemgmt -
-D /var/run/lsm/ipc 0775 root libstoragemgmt -
+D /run/lsm 0775 root libstoragemgmt -
+D /run/lsm/ipc 0775 root libstoragemgmt -

75
SPECS/libstoragemgmt.spec
View File

@ -1,17 +1,19 @@
%bcond_with test
Name: libstoragemgmt
Version: 1.6.2
Release: 9%{?dist}
Version: 1.8.1
Release: 2%{?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_1560205_remove_yajl_dep.patch
Patch1: BZ_1623506_lsm_fix_fhs.patch
Patch2: BZ_1612755_lsm_fix_lsmd_conf_manpage.patch
Patch0: BZ_1710776_change_run_dir.patch
Requires: python3-%{name}
# Netapp 7 mode plugin is no more.
Obsoletes: %{name}-netapp-plugin
BuildRequires: gcc gcc-c++
BuildRequires: autoconf automake libtool libxml2-devel check-devel perl-interpreter
BuildRequires: openssl-devel
@ -55,6 +57,10 @@ 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
# 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
%{?python_provide:%python_provide python3-%{name}}
%description -n python3-%{name}
@ -87,21 +93,6 @@ Requires(postun): python3-%{name} = %{version}
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
Requires: python3-%{name} = %{version}
Requires(post): python3-%{name} = %{version}
Requires(postun): python3-%{name} = %{version}
Requires: python3-%{name} = %{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
@ -176,6 +167,7 @@ Summary: Files for NFS local filesystem support for %{name}
Group: System Environment/Libraries
Requires: python3-%{name} = %{version}
Requires: %{name}-nfs-plugin-clibs = %{version}
Requires: nfs-utils
Requires(post): python3-%{name} = %{version}
Requires(postun): python3-%{name} = %{version}
BuildArch: noarch
@ -212,7 +204,7 @@ without caring which real plugin(s) should be used.
%build
./autogen.sh
%configure PYTHON=%{__python3} --with-python3 --disable-static \
%configure PYTHON=%{__python3} --with-python3 --without-ontap --disable-static \
%if %{without test}
--without-test
%endif
@ -237,7 +229,6 @@ install -m 755 tools/udev/scan-scsi-target \
pathfix.py -pni "%{__python3}" \
%{buildroot}/usr/bin/nfs_lsmplugin \
%{buildroot}/usr/bin/lsmcli \
%{buildroot}/usr/bin/ontap_lsmplugin \
%{buildroot}/usr/bin/arcconf_lsmplugin \
%{buildroot}/usr/bin/targetd_lsmplugin \
%{buildroot}/usr/bin/sim_lsmplugin \
@ -289,19 +280,6 @@ if [ $1 -eq 0 ]; then
/usr/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
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 || :
fi
%postun netapp-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 targetd-plugin
if [ $1 -eq 1 ]; then
@ -475,17 +453,6 @@ fi
%{_bindir}/smispy_lsmplugin
%{_mandir}/man1/smispy_lsmplugin.1*
%files netapp-plugin
%defattr(-,root,root,-)
%dir %{python3_sitelib}/lsm/plugin/ontap
%dir %{python3_sitelib}/lsm/plugin/ontap/__pycache__
%{python3_sitelib}/lsm/plugin/ontap/__pycache__/*
%{python3_sitelib}/lsm/plugin/ontap/__init__.*
%{python3_sitelib}/lsm/plugin/ontap/na.*
%{python3_sitelib}/lsm/plugin/ontap/ontap.*
%{_bindir}/ontap_lsmplugin
%{_mandir}/man1/ontap_lsmplugin.1*
%files targetd-plugin
%defattr(-,root,root,-)
%dir %{python3_sitelib}/lsm/plugin/targetd
@ -573,6 +540,22 @@ fi
%{_mandir}/man1/local_lsmplugin.1*
%changelog
* Thu Jun 13 2019 Tony Asleson <tasleson@redhat.com> - 1.8.1-2
- Correct gating.yaml (RHBZ #1720284)
* Tue Jun 11 2019 Tony Asleson <tasleson@redhat.com> - 1.8.1-1
- Obsolete the netapp plugin.
* Fri May 24 2019 Tony Asleson <tasleson@redhat.com> - 1.8.1-0
- Upgrade to 1.8.1
* Wed May 22 2019 Tony Asleson <tasleson@redhat.com> - 1.6.2-11
- Fix tmpfiles run directory (RHBZ #1710776)
- Add nfs-utils dependency (RHBZ #1657407)
* Tue Oct 16 2018 Tony Asleson <tasleson@redhat.com> - 1.6.2-10
- Remove NetApp Ontap plugin. (RHBZ #1626415)
* Tue Sep 25 2018 Gris Ge <fge@redhat.com> - 1.6.2-9
- Fix the manapge of lsmd.conf. (RHBZ #1612755)