Update to release 1.7.0

Signed-off-by: Tony Asleson <tasleson@redhat.com>

.gitignore

@@ -25,3 +25,4 @@
 /libstoragemgmt-1.6.0.tar.gz
 /libstoragemgmt-1.6.1.tar.gz
 /libstoragemgmt-1.6.2.tar.gz
+/libstoragemgmt-1.7.0.tar.gz

0001-change-run-dir.patch

@@ -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 -

0001-lsmcli-Fix-required-to-run-on-python3.7.patch

@@ -1,38 +0,0 @@
-From 5715d7c495e4146700b3d1f0f3739b5e970ade68 Mon Sep 17 00:00:00 2001
-From: Gris Ge <fge@redhat.com>
-Date: Tue, 26 Jun 2018 01:46:39 +0800
-Subject: [PATCH] lsmcli: Fix required to run on python3.7
-
- * Python 3.7 introduced new reserved keywords -- `async` which happened
-   to be used in lsmcli. We change lsmcli to use `_async` instead.
-
-Signed-off-by: Gris Ge <fge@redhat.com>
----
- tools/lsmcli/cmdline.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/lsmcli/cmdline.py b/tools/lsmcli/cmdline.py
-index 664bf0d3..9a8324ad 100644
---- a/tools/lsmcli/cmdline.py
-+++ b/tools/lsmcli/cmdline.py
-@@ -187,7 +187,7 @@ def _add_common_options(arg_parser, is_child=False):
-         help='Include the header with terse')
- 
-     arg_parser.add_argument(
--        '-b', action="store_true", dest="%sasync" % prefix, default=False,
-+        '-b', action="store_true", dest="%s_async" % prefix, default=False,
-         help='Run the command async. Instead of waiting for completion.\n '
-              'Command will exit(7) and job id written to stdout.')
- 
-@@ -1459,7 +1459,7 @@ def _wait_for_it(self, msg, job, item):
-         else:
-             # If a user doesn't want to wait, return the job id to stdout
-             # and exit with job in progress
--            if self.args.async:
-+            if self.args._async:
-                 out(job)
-                 self.shutdown(ErrorNumber.JOB_STARTED)
- 
--- 
-2.18.0
-

libstoragemgmt.spec

@@ -2,23 +2,23 @@
 %global py2_build_dir %{_builddir}/%{name}-%{version}-%{release}-python2
 
 %if 0%{?rhel} > 7 || 0%{?fedora} > 28
-%bcond_with  python2
+%bcond_with     python2
 %else
-%bcond_without     python2
+%bcond_without  python2
 %endif
 
 Name:           libstoragemgmt
-Version:        1.6.2
-Release:        10%{?dist}
+Version:        1.7.0
+Release:        1%{?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
-Patch1:         0001-lsmcli-Fix-required-to-run-on-python3.7.patch
+Patch1:         0001-change-run-dir.patch
 Requires:       python3-%{name}
 BuildRequires:  gcc gcc-c++
-BuildRequires:  autoconf automake libtool yajl-devel libxml2-devel check-devel perl-interpreter
+BuildRequires:  autoconf automake libtool libxml2-devel check-devel perl-interpreter
 BuildRequires:  openssl-devel
 BuildRequires:  glib2-devel
 BuildRequires:  systemd
@@ -523,9 +523,9 @@ fi
 %{python3_sitelib}/lsm/lsmcli/data_display.*
 %{python3_sitelib}/lsm/lsmcli/cmdline.*
 %{_bindir}/sim_lsmplugin
-%dir %{_bindir}/lsm.d
-%{_bindir}/lsm.d/find_unused_lun.py
-%{_bindir}/lsm.d/local_sanity_check.py
+%dir %{_libexecdir}/lsm.d
+%{_libexecdir}/lsm.d/find_unused_lun.py*
+%{_libexecdir}/lsm.d/local_sanity_check.py*
 %{_sysconfdir}/lsm/pluginconf.d/sim.conf
 %{_mandir}/man1/sim_lsmplugin.1*
 
@@ -639,6 +639,9 @@ fi
 %{_mandir}/man1/local_lsmplugin.1*
 
 %changelog
+* Wed Oct 31 2018 Tony Asleson <tasleson@redhat.com> - 1.7.0-1
+- Upgrade to 1.7.0
+
 * Tue Sep 18 2018 Gris Ge <fge@redhat.com> - 1.6.2-10
 - Add explicit package version requirement to libstoragemgmt-nfs-plugin-clibs.
 

sources

@@ -1 +1 @@
-SHA512 (libstoragemgmt-1.6.2.tar.gz) = 5ac20bf7c6e9ceb14634b8bebce0c3bb0655d6e7536859103938a269369a451e3e3234f0f4c91460ae273b3171d549842d9219edc8ec8dd83ef91d124cc95b73
+SHA512 (libstoragemgmt-1.7.0.tar.gz) = 32f38ef1b399a9732355700eaa920bf47d7884a1c23a8a1645959a5401f22fd8b3772c411239a9ed59c85b25349b2540f539bb4cdc4907e5d1c6b1390b8e68b2