From 12a5a5d0040ddf104bddf4ef0418f31b2a44d301 Mon Sep 17 00:00:00 2001
From: Tony Asleson <tasleson@redhat.com>
Date: Tue, 6 Nov 2018 13:41:03 -0600
Subject: [PATCH] Update to release 1.7.1

Signed-off-by: Tony Asleson <tasleson@redhat.com>
---
 .gitignore                          |  1 +
 0002-find_unused_lun_specific.patch | 25 +++++++++++++++++++++++++
 libstoragemgmt.spec                 | 21 ++++++++++++---------
 sources                             |  2 +-
 4 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 0002-find_unused_lun_specific.patch

diff --git a/.gitignore b/.gitignore
index b18a82e..00ad8d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /libstoragemgmt-1.6.1.tar.gz
 /libstoragemgmt-1.6.2.tar.gz
 /libstoragemgmt-1.7.0.tar.gz
+/libstoragemgmt-1.7.1.tar.gz
diff --git a/0002-find_unused_lun_specific.patch b/0002-find_unused_lun_specific.patch
new file mode 100644
index 0000000..df2bb7d
--- /dev/null
+++ b/0002-find_unused_lun_specific.patch
@@ -0,0 +1,25 @@
+diff --git a/configure.ac b/configure.ac
+index f6742d0..70b0d41 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -551,5 +551,7 @@ AC_CONFIG_FILES([test/cmdtest.py],
+     [chmod +x test/cmdtest.py])
+ AC_CONFIG_FILES([tools/sanity_check/local_sanity_check.py],
+     [chmod +x tools/sanity_check/local_sanity_check.py])
++AC_CONFIG_FILES([tools/use_cases/find_unused_lun.py],
++    [chmod +x tools/use_cases/find_unused_lun.py])
+ 
+ AC_OUTPUT
+diff --git a/tools/use_cases/find_unused_lun.py b/tools/use_cases/find_unused_lun.py.in
+similarity index 99%
+rename from tools/use_cases/find_unused_lun.py
+rename to tools/use_cases/find_unused_lun.py.in
+index 6ddda8b..d433e33 100755
+--- a/tools/use_cases/find_unused_lun.py
++++ b/tools/use_cases/find_unused_lun.py.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python@PY_VERSION@
+ #
+ # Copyright (C) 2017 Red Hat, Inc.
+ # This library is free software; you can redistribute it and/or
diff --git a/libstoragemgmt.spec b/libstoragemgmt.spec
index 924de32..e50ef74 100644
--- a/libstoragemgmt.spec
+++ b/libstoragemgmt.spec
@@ -8,7 +8,7 @@
 %endif
 
 Name:           libstoragemgmt
-Version:        1.7.0
+Version:        1.7.1
 Release:        1%{?dist}
 Summary:        Storage array management library
 Group:          System Environment/Libraries
@@ -16,6 +16,7 @@ License:        LGPLv2+
 URL:            https://github.com/libstorage/libstoragemgmt
 Source0:        https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz
 Patch1:         0001-change-run-dir.patch
+Patch2:         0002-find_unused_lun_specific.patch
 Requires:       python3-%{name}
 BuildRequires:  gcc gcc-c++
 BuildRequires:  autoconf automake libtool libxml2-devel check-devel perl-interpreter
@@ -231,8 +232,8 @@ Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 %description    nfs-plugin-clibs
-The %{name}-nfs-plugin-clibs package contains python C extension for %{name}
-NFS plugin.
+The %{name}-nfs-plugin-clibs package contains python C
+extension for %{name} NFS plugin.
 
 
 %package        local-plugin
@@ -244,9 +245,8 @@ Requires(postun): python3-%{name} = %{version}
 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.
+The %{name}-local-plugin is a plugin that provides auto
+plugin selection for locally managed storage.
 
 %prep
 %autosetup -p1
@@ -526,7 +526,7 @@ fi
 %dir %{_libexecdir}/lsm.d
 %{_libexecdir}/lsm.d/find_unused_lun.py*
 %{_libexecdir}/lsm.d/local_sanity_check.py*
-%{_sysconfdir}/lsm/pluginconf.d/sim.conf
+%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/sim.conf
 %{_mandir}/man1/sim_lsmplugin.1*
 
 %files -n python3-%{name}-clibs
@@ -610,7 +610,7 @@ fi
 %{python3_sitelib}/lsm/plugin/nfs/__pycache__/*
 %{python3_sitelib}/lsm/plugin/nfs/__init__.*
 %{python3_sitelib}/lsm/plugin/nfs/nfs.*
-%{_sysconfdir}/lsm/pluginconf.d/nfs.conf
+%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/nfs.conf
 %{_bindir}/nfs_lsmplugin
 %{_mandir}/man1/nfs_lsmplugin.1*
 
@@ -634,11 +634,14 @@ fi
 %{python3_sitelib}/lsm/plugin/local/__pycache__/*
 %{python3_sitelib}/lsm/plugin/local/__init__.*
 %{python3_sitelib}/lsm/plugin/local/local.*
-%{_sysconfdir}/lsm/pluginconf.d/local.conf
+%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/local.conf
 %{_bindir}/local_lsmplugin
 %{_mandir}/man1/local_lsmplugin.1*
 
 %changelog
+* Tue Nov 6 2018 Tony Asleson <tasleson@redhat.com> - 1.7.1-1
+- Upgrade to 1.7.1
+
 * Wed Oct 31 2018 Tony Asleson <tasleson@redhat.com> - 1.7.0-1
 - Upgrade to 1.7.0
 
diff --git a/sources b/sources
index 8ff2c0d..f119418 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libstoragemgmt-1.7.0.tar.gz) = 32f38ef1b399a9732355700eaa920bf47d7884a1c23a8a1645959a5401f22fd8b3772c411239a9ed59c85b25349b2540f539bb4cdc4907e5d1c6b1390b8e68b2
+SHA512 (libstoragemgmt-1.7.1.tar.gz) = 28818a6768fcde60b614ad48158bba081f1a945ef8034bf9fb4f467c9944075457a8256f7624a4fe3fd94cb5278ec24fa1ea9b02203ec16ad61a9f1aa209a50c