Upgrade to 1.6.1

Signed-off-by: Gris Ge <fge@redhat.com>

.gitignore

@@ -14,3 +14,9 @@
 /libstoragemgmt-0.0.24.tar.gz
 /libstoragemgmt-0.1.0.tar.gz
 /libstoragemgmt-1.0.0.tar.gz
+/libstoragemgmt-1.2.1.tar.gz
+/libstoragemgmt-1.2.3.tar.gz
+/libstoragemgmt-1.3.1.tar.gz
+/libstoragemgmt-1.3.2.tar.gz
+/libstoragemgmt-1.3.5.tar.gz
+/libstoragemgmt-1.6.1.tar.gz

libstoragemgmt-0.0.9-secondary.patch

@@ -1,36 +0,0 @@
-diff -up libstoragemgmt-0.0.9/configure.ac.secondary libstoragemgmt-0.0.9/configure.ac
---- libstoragemgmt-0.0.9/configure.ac.secondary	2012-07-27 13:13:45.000000000 +0200
-+++ libstoragemgmt-0.0.9/configure.ac	2012-07-27 13:18:52.000000000 +0200
-@@ -111,6 +111,14 @@ if test "x${want_smis_cpp}" = "xyes"; th
-         *Linux*) case `uname -m` in
-                      x86_64) PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_X86_64_GNU";;
-                      i?86)   PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_IX86_GNU";;
-+                     ia64)   PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_IA64_GNU";;
-+                     ppc)    PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_PPC_GNU";;
-+                     ppc64)  PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_PPC64_GNU";;
-+                     s390)   PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_ZSERIES_GNU";;
-+                     s390x)  PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_ZSERIES64_GNU";;
-+                     sparcv9) PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_SPARCV9_GNU";;
-+                     sparc64) PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_SPARC64_GNU";;
-+                     arm*)   PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_XSCALE_GNU";;
-                  esac
-     esac
-     if test "$PEGASUS_CFLAGS" = "" ; then
-diff -up libstoragemgmt-0.0.9/configure.secondary libstoragemgmt-0.0.9/configure
---- libstoragemgmt-0.0.9/configure.secondary	2012-07-27 13:19:25.000000000 +0200
-+++ libstoragemgmt-0.0.9/configure	2012-07-27 13:21:04.000000000 +0200
-@@ -19274,6 +19274,14 @@ if test "x${want_smis_cpp}" = "xyes"; th
-         *Linux*) case `uname -m` in
-                      x86_64) PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_X86_64_GNU";;
-                      i?86)   PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_IX86_GNU";;
-+                     ia64)   PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_IA64_GNU";;
-+                     ppc)    PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_PPC_GNU";;
-+                     ppc64)  PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_PPC64_GNU";;
-+                     s390)   PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_ZSERIES_GNU";;
-+                     s390x)  PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_ZSERIES64_GNU";;
-+                     sparcv9) PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_SPARCV9_GNU";;
-+                     sparc64) PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_SPARC64_GNU";;
-+                     arm*)   PEGASUS_CFLAGS="-DPEGASUS_PLATFORM_LINUX_XSCALE_GNU";;
-                  esac
-     esac
-     if test "$PEGASUS_CFLAGS" = "" ; then

libstoragemgmt.spec

@@ -1,46 +1,34 @@
-%bcond_without rest_api
-
-%if 0%{?rhel} <= 6
-%global with_rest_api 0
-# RHEL 6 does not have libmicrohttpd in main repo, but in EPEL repo
-# Hence we disable REST API daemon compiling.
-# If EPEL6 is enabled, please use:
-#   rpmbuild -ba libstoragemgmt.spec --with rest_api
-%endif
-
-%{?_with_rest_api:
-%global with_rest_api 1
-}
-%{?_without_rest_api:
-%global with_rest_api 0
-}
+%bcond_with     test
 
 Name:           libstoragemgmt
-Version:        1.0.0
+Version:        1.6.1
 Release:        1%{?dist}
 Summary:        Storage array management library
 Group:          System Environment/Libraries
 License:        LGPLv2+
-URL:            http://sourceforge.net/projects/libstoragemgmt/
-Source0:        http://sourceforge.net/projects/libstoragemgmt/files/libstoragemgmt-%{version}.tar.gz
+URL:            https://github.com/libstorage/libstoragemgmt
+Source0:        https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       %{name}-python
 BuildRequires:  autoconf automake libtool yajl-devel libxml2-devel check-devel perl
 BuildRequires:  openssl-devel
 BuildRequires:  python-argparse
+BuildRequires:  python-six
 BuildRequires:  glib2-devel
-# Explicitly require gcc-c++
-BuildRequires:  gcc-c++
-BuildRequires:  PyYAML
+BuildRequires:  libconfig-devel
+BuildRequires:  libudev-devel
+BuildRequires:  python2-devel
+BuildRequires:  procps
+BuildRequires:  sqlite-devel
 
-
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-BuildRequires:  systemd-units
 Requires: initscripts
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-%endif
+Requires(post): initscripts
+Requires(preun): initscripts
+Requires(postun): initscripts
+
+BuildRequires:  chrpath
+BuildRequires:  valgrind
+BuildRequires:  python-pyudev
 
 %description
 The libStorageMgmt library will provide a vendor agnostic open source storage
@@ -62,20 +50,35 @@ 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}
 Group:          System Environment/Libraries
 BuildRequires:  pywbem
-Requires:       pywbem %{name}-python
-Requires:       libstoragemgmt-python = %{version}-%{release}
+Requires:       pywbem
 BuildArch:      noarch
+Provides:       %{name}-ibm-v7k-plugin = 2:%{version}-%{release}
+Obsoletes:      %{name}-ibm-v7k-plugin <= 2:0.1.0-3
+Requires:       %{name}-python = %{version}
+Requires(post): %{name}-python = %{version}
+Requires(postun): %{name}-python = %{version}
+
 
 %description    smis-plugin
 The %{name}-smis-plugin package contains plug-in for generic SMI-S array
@@ -86,8 +89,11 @@ support.
 Summary:        Files for NetApp array support for %{name}
 Group:          System Environment/Libraries
 BuildRequires:  m2crypto
-Requires:       m2crypto  %{name}-python
-Requires:       libstoragemgmt-python = %{version}-%{release}
+Requires:       m2crypto
+Requires:       %{name}-python = %{version}
+Requires(post): %{name}-python = %{version}
+Requires(postun): %{name}-python = %{version}
+Requires:       %{name}-python = %{version}-%{release}
 BuildArch:      noarch
 
 %description    netapp-plugin
@@ -98,8 +104,9 @@ support.
 %package        targetd-plugin
 Summary:        Files for targetd array support for %{name}
 Group:          System Environment/Libraries
-Requires:       %{name}-python
-Requires:       libstoragemgmt-python = %{version}-%{release}
+Requires:       %{name}-python = %{version}
+Requires(post): %{name}-python = %{version}
+Requires(postun): %{name}-python = %{version}
 BuildArch:      noarch
 
 %description    targetd-plugin
@@ -110,8 +117,9 @@ support.
 %package        nstor-plugin
 Summary:        Files for NexentaStor array support for %{name}
 Group:          System Environment/Libraries
-Requires:       %{name}-python
-Requires:       libstoragemgmt-python = %{version}-%{release}
+Requires:       %{name}-python = %{version}
+Requires(post): %{name}-python = %{version}
+Requires(postun): %{name}-python = %{version}
 BuildArch:      noarch
 
 %description    nstor-plugin
@@ -119,37 +127,88 @@ The %{name}-nstor-plugin package contains plug-in for NexentaStor array
 support.
 
 %package        udev
-Summary:        udev files for %{name}
+Summary:        Udev files for %{name}
 Group:          System Environment/Base
 
 %description    udev
 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}-%{release}
-Requires:       libmicrohttpd json-c
-BuildRequires:  libmicrohttpd-devel json-c-devel
+%package        megaraid-plugin
+Summary:        Files for LSI MegaRAID support for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name}-python = %{version}
+Requires(post): %{name}-python = %{version}
+Requires(postun): %{name}-python = %{version}
+BuildArch:      noarch
 
-%description    rest
-the %{name}-rest package contains the http daemon for %{name} rest api.
-%endif
+%description    megaraid-plugin
+The %{name}-megaraid-plugin package contains the plugin for LSI
+MegaRAID storage management via storcli.
+
+%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
+
+%description    hpsa-plugin
+The %{name}-hpsa-plugin package contains the plugin for HP
+SmartArray storage management via hpssacli.
+
+%package        arcconf-plugin
+Summary:        Files for Microsemi Adaptec and Smart Family support for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name}-python = %{version}
+Requires(post): %{name}-python = %{version}
+Requires(postun): %{name}-python = %{version}
+BuildArch:      noarch
+
+%description    arcconf-plugin
+The %{name}-arcconf-plugin package contains the plugin for Microsemi
+Adaptec RAID and Smart Family Controller storage management.
+
+%package        nfs-plugin
+Summary:        Files for NFS local filesystem support for %{name}
+Group:          System Environment/Libraries
+Requires:       %{name}-python = %{version}
+Requires:       %{name}-nfs-plugin-clibs = %{version}
+Requires(post): %{name}-python = %{version}
+Requires(postun): %{name}-python = %{version}
+
+%description    nfs-plugin
+The nfs-plugin package contains plug-in for local NFS exports support.
+
+%package        nfs-plugin-clibs
+Summary:        Python C extension module for %{name} NFS plugin
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}
+
+%description    nfs-plugin-clibs
+The %{name}-nfs-plugin-clibs package contains python C extension for %{name}
+NFS plugin.
+
+%package        local-plugin
+Summary:        Files for local pseudo plugin of %{name}
+Group:          System Environment/Libraries
+Requires:       %{name}-python = %{version}
+Requires(post): %{name}-python = %{version}
+Requires(postun): %{name}-python = %{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.
 
 %prep
 %setup -q
 
 %build
-./autogen.sh
-
-#Tell the install program to preserve file date/timestamps
-%configure \
-%if 0%{?with_rest_api} != 1
-    --without-rest-api \
-%endif
-    --disable-static
+%configure --disable-static
 
 V=1 make %{?_smp_mflags}
 
@@ -158,21 +217,9 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-install -d -m755 %{buildroot}/%{_unitdir}
-install -m644 packaging/daemon/libstoragemgmt.service \
-    %{buildroot}/%{_unitdir}/libstoragemgmt.service
-
-#tempfiles.d configuration for /var/run
-mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
-install -m 0644 packaging/daemon/lsm-tmpfiles.conf \
-    %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
-%else
-#Need these to exist at install so we can start the daemon
 mkdir -p %{buildroot}/etc/rc.d/init.d
 install packaging/daemon/libstoragemgmtd \
     %{buildroot}/etc/rc.d/init.d/libstoragemgmtd
-%endif
 
 #Need these to exist at install so we can start the daemon
 mkdir -p %{buildroot}%{_localstatedir}/run/lsm/ipc
@@ -186,12 +233,14 @@ install -m 755 tools/udev/scan-scsi-target \
 %clean
 rm -rf %{buildroot}
 
+%if 0%{with test}
 %check
 if ! make check
 then
-  cat test/test-suite.log || true
+  cat test-suite.log || true
   exit 1
 fi
+%endif
 
 %pre
 getent group libstoragemgmt >/dev/null || groupadd -r libstoragemgmt
@@ -202,163 +251,345 @@ getent passwd libstoragemgmt >/dev/null || \
 %post
 /sbin/ldconfig
 if [ $1 -eq 1 ]; then
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-    /bin/systemctl enable libstoragemgmt.service >/dev/null 2>&1 || :
-%else
     /sbin/chkconfig --add libstoragemgmtd
-%endif
 fi
 
-%if 0%{?with_rest_api}
-%preun rest
-if [ $1 -eq 0 ]; then
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-    # On uninstall (not upgrade), disable and stop the units
-    /bin/systemctl --no-reload disable \
-        libstoragemgmt-rest.service >/dev/null 2>&1 || :
-    /bin/systemctl stop libstoragemgmt-rest.service >/dev/null 2>&1 || :
-%endif
-fi
-
-%postun rest
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-    # On upgrade (not uninstall), optionally, restart the daemon
-    /bin/systemctl try-restart libstoragemgmt-rest.service >/dev/null 2>&1 || :
-%endif
-fi
-%endif
-
 %preun
 if [ $1 -eq 0 ]; then
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-    # On uninstall (not upgrade), disable and stop the units
-    /bin/systemctl --no-reload disable libstoragemgmt.service >/dev/null 2>&1 || :
-    /bin/systemctl stop libstoragemgmt.service >/dev/null 2>&1 || :
-%else
-    /etc/rc.d/init.d/libstoragemgmtd stop > /dev/null 2>&1 || :
+    /etc/rc.d/init.d/libstoragemgmtd stop >/dev/null 2>&1 || :
     /sbin/chkconfig --del libstoragemgmtd
-%endif
 fi
 
 %postun
 /sbin/ldconfig
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-    # On upgrade (not uninstall), optionally, restart the daemon
-    /bin/systemctl try-restart libstoragemgmt.service >/dev/null 2>&1 || :
-%else
     #Restart the daemond
     /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
-%endif
+fi
+
+# Need to restart lsmd if plugin is new installed or removed.
+%post smis-plugin
+if [ $1 -eq 1 ]; then
+    # New install.
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+
+%postun smis-plugin
+if [ $1 -eq 0 ]; then
+    # Remove
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/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.
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+
+%postun netapp-plugin
+if [ $1 -eq 0 ]; then
+    # Remove
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+
+# Need to restart lsmd if plugin is new installed or removed.
+%post targetd-plugin
+if [ $1 -eq 1 ]; then
+    # New install.
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+
+%postun targetd-plugin
+if [ $1 -eq 0 ]; then
+    # Remove
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+
+# Need to restart lsmd if plugin is new installed or removed.
+%post nstor-plugin
+if [ $1 -eq 1 ]; then
+    # New install.
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+
+%postun nstor-plugin
+if [ $1 -eq 0 ]; then
+    # Remove
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+
+# Need to restart lsmd if plugin is new installed or removed.
+%post megaraid-plugin
+if [ $1 -eq 1 ]; then
+    # New install.
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+%postun megaraid-plugin
+if [ $1 -eq 0 ]; then
+    # Remove
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+
+# Need to restart lsmd if plugin is new installed or removed.
+%post hpsa-plugin
+if [ $1 -eq 1 ]; then
+    # New install.
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+%postun hpsa-plugin
+if [ $1 -eq 0 ]; then
+    # Remove
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+
+# Need to restart lsmd if plugin is new installed or removed.
+%post arcconf-plugin
+if [ $1 -eq 1 ]; then
+    # New install.
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+%postun arcconf-plugin
+if [ $1 -eq 0 ]; then
+    # Remove
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+
+# Need to restart lsmd if plugin is new installed or removed.
+%post nfs-plugin
+if [ $1 -eq 1 ]; then
+    # New install.
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+%postun nfs-plugin
+if [ $1 -eq 0 ]; then
+    # Remove
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+
+# Need to restart lsmd if plugin is new installed or removed.
+%post local-plugin
+if [ $1 -eq 1 ]; then
+    # New install.
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
+fi
+%postun local-plugin
+if [ $1 -eq 0 ]; then
+    # Remove
+    /etc/rc.d/init.d/libstoragemgmtd restart  >/dev/null 2>&1 || :
 fi
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING.LIB
+%doc README COPYING.LIB NEWS
 %{_mandir}/man1/lsmcli.1*
 %{_mandir}/man1/lsmd.1*
+%{_mandir}/man5/lsmd.conf.5*
 %{_libdir}/*.so.*
 %{_bindir}/lsmcli
+%{_sysconfdir}/bash_completion.d/lsmcli
 %{_bindir}/lsmd
 %{_bindir}/simc_lsmplugin
-%{python_sitelib}/lsm/lsmcli/__init__.*
-%{python_sitelib}/lsm/lsmcli/data_display.*
-%{python_sitelib}/lsm/lsmcli/cmdline.*
+%dir %{_sysconfdir}/lsm
+%dir %{_sysconfdir}/lsm/pluginconf.d
+%config(noreplace) %{_sysconfdir}/lsm/lsmd.conf
+%{_mandir}/man1/simc_lsmplugin.1*
 
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-%{_unitdir}/*
-%endif
+%dir %attr(0755, root, libstoragemgmt) %{_localstatedir}/run/lsm/
+%dir %attr(0755, root, libstoragemgmt) %{_localstatedir}/run/lsm/ipc
 
-%dir %attr(0755, libstoragemgmt, libstoragemgmt) %{_localstatedir}/run/lsm/
-%dir %attr(0755, libstoragemgmt, libstoragemgmt) %{_localstatedir}/run/lsm/ipc
-
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-%attr(0644, root, root)  %{_sysconfdir}/tmpfiles.d/%{name}.conf
-%else
 %attr(0755, root, root) /etc/rc.d/init.d/libstoragemgmtd
-%endif
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/libstoragemgmt.pc
+%{_libdir}/pkgconfig/%{name}.pc
+%{_mandir}/man3/lsm_*
+%{_mandir}/man3/libstoragemgmt*
 
 %files python
 %defattr(-,root,root,-)
 #Python library files
+%dir %{python_sitelib}/lsm
 %{python_sitelib}/lsm/__init__.*
+%dir %{python_sitelib}/lsm/external
 %{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.*
 %{python_sitelib}/lsm/_transport.*
 %{python_sitelib}/lsm/version.*
+%dir %{python_sitelib}/lsm/plugin
 %{python_sitelib}/lsm/plugin/__init__.*
+%dir %{python_sitelib}/lsm/plugin/sim
 %{python_sitelib}/lsm/plugin/sim/__init__.*
 %{python_sitelib}/lsm/plugin/sim/simulator.*
 %{python_sitelib}/lsm/plugin/sim/simarray.*
+%dir %{python_sitelib}/lsm/lsmcli
+%{python_sitelib}/lsm/lsmcli/__init__.*
+%{python_sitelib}/lsm/lsmcli/data_display.*
+%{python_sitelib}/lsm/lsmcli/cmdline.*
 %{_bindir}/sim_lsmplugin
+%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
 %{python_sitelib}/lsm/plugin/smispy/__init__.*
-%{python_sitelib}/lsm/plugin/smispy/eseries.*
 %{python_sitelib}/lsm/plugin/smispy/smis.*
-%{python_sitelib}/lsm/plugin/smispy/smisproxy.*
 %{python_sitelib}/lsm/plugin/smispy/dmtf.*
+%{python_sitelib}/lsm/plugin/smispy/utils.*
+%{python_sitelib}/lsm/plugin/smispy/smis_common.*
+%{python_sitelib}/lsm/plugin/smispy/smis_cap.*
+%{python_sitelib}/lsm/plugin/smispy/smis_sys.*
+%{python_sitelib}/lsm/plugin/smispy/smis_pool.*
+%{python_sitelib}/lsm/plugin/smispy/smis_disk.*
+%{python_sitelib}/lsm/plugin/smispy/smis_vol.*
+%{python_sitelib}/lsm/plugin/smispy/smis_ag.*
 %{_bindir}/smispy_lsmplugin
+%{_mandir}/man1/smispy_lsmplugin.1*
 
 %files netapp-plugin
 %defattr(-,root,root,-)
+%dir %{python_sitelib}/lsm/plugin/ontap
 %{python_sitelib}/lsm/plugin/ontap/__init__.*
 %{python_sitelib}/lsm/plugin/ontap/na.*
 %{python_sitelib}/lsm/plugin/ontap/ontap.*
 %{_bindir}/ontap_lsmplugin
+%{_mandir}/man1/ontap_lsmplugin.1*
 
 %files targetd-plugin
 %defattr(-,root,root,-)
+%dir %{python_sitelib}/lsm/plugin/targetd
 %{python_sitelib}/lsm/plugin/targetd/__init__.*
 %{python_sitelib}/lsm/plugin/targetd/targetd.*
 %{_bindir}/targetd_lsmplugin
+%{_mandir}/man1/targetd_lsmplugin.1*
 
 %files nstor-plugin
 %defattr(-,root,root,-)
+%dir %{python_sitelib}/lsm/plugin/nstor
 %{python_sitelib}/lsm/plugin/nstor/__init__.*
 %{python_sitelib}/lsm/plugin/nstor/nstor.*
 %{_bindir}/nstor_lsmplugin
+%{_mandir}/man1/nstor_lsmplugin.1*
 
 %files udev
 %defattr(-,root,root,-)
 /lib/udev/scan-scsi-target
 /lib/udev/rules.d/90-scsi-ua.rules
 
-%if 0%{?with_rest_api}
-%files rest
+%files megaraid-plugin
 %defattr(-,root,root,-)
-%{_bindir}/lsm_restd
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-%{_unitdir}/libstoragemgmt-rest.service
-%endif
-%endif
+%dir %{python_sitelib}/lsm/plugin/megaraid
+%{python_sitelib}/lsm/plugin/megaraid/__init__.*
+%{python_sitelib}/lsm/plugin/megaraid/megaraid.*
+%{python_sitelib}/lsm/plugin/megaraid/utils.*
+%{_bindir}/megaraid_lsmplugin
+%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/megaraid.conf
+%{_mandir}/man1/megaraid_lsmplugin.1*
+
+%files hpsa-plugin
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/lsm/plugin/hpsa
+%{python_sitelib}/lsm/plugin/hpsa/__init__.*
+%{python_sitelib}/lsm/plugin/hpsa/hpsa.*
+%{python_sitelib}/lsm/plugin/hpsa/utils.*
+%{_bindir}/hpsa_lsmplugin
+%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/hpsa.conf
+%{_mandir}/man1/hpsa_lsmplugin.1*
+
+%files nfs-plugin
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/lsm/plugin/nfs
+%{python_sitelib}/lsm/plugin/nfs/__init__.*
+%{python_sitelib}/lsm/plugin/nfs/nfs.*
+%{_sysconfdir}/lsm/pluginconf.d/nfs.conf
+%{_bindir}/nfs_lsmplugin
+%{_mandir}/man1/nfs_lsmplugin.1*
+
+%files nfs-plugin-clibs
+%{python_sitelib}/lsm/plugin/nfs/nfs_clib.*
+
+%files arcconf-plugin
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/lsm/plugin/arcconf
+%{python_sitelib}/lsm/plugin/arcconf/__init__.*
+%{python_sitelib}/lsm/plugin/arcconf/arcconf.*
+%{python_sitelib}/lsm/plugin/arcconf/utils.*
+%{_bindir}/arcconf_lsmplugin
+%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/arcconf.conf
+%{_mandir}/man1/arcconf_lsmplugin.1*
+
+%files local-plugin
+%defattr(-,root,root,-)
+%dir %{python_sitelib}/lsm/plugin/local
+%{python_sitelib}/lsm/plugin/local/__init__.*
+%{python_sitelib}/lsm/plugin/local/local.*
+%{_sysconfdir}/lsm/pluginconf.d/local.conf
+%{_bindir}/local_lsmplugin
+%{_mandir}/man1/local_lsmplugin.1*
 
 %changelog
+* Fri Mar 23 2018 Gris Ge <fge@redhat.com> - 1.6.1-1
+- Upgrade to 1.6.1
+
+* Tue Sep 27 2016 Gris Ge <fge@redhat.com> 1.3.5-1
+- Upgrade to 1.3.5
+
+* Wed May 18 2016 Tony Asleson <tasleson@redhat.com> 1.3.2-1
+- New upstream release 1.3.2
+
+* Fri May 13 2016 Tony Asleson <tasleson@redhat.com> 1.3.1-2
+- Disable make check as we are hitting a valgrind memleak in ld.so
+  on arm arch.
+- New upstream release 1.3.1
+
+* Tue Jan 12 2016 Tony Asleson <tasleson@redhat.com> 1.2.3-2
+- https://bugzilla.redhat.com/show_bug.cgi?id=1297693
+
+* Wed Jun 24 2015 Gris Ge <fge@redhat.com> 1.2.3-1
+- New upstream release 1.2.3:
+    * Bug fixes:
+        * lsmcli bash completion: Fix syntax error.
+        * lsmcli bash completion: Fix volume-delete.
+        * lsmcli bash completion: Add missing completions.
+        * Fix: selinux dac_override
+        * Manpage: Update hpsa and megaraid plugin manpages.
+        * HP Smart Array Plugin: Fix pool querying on P410i.
+        * MegaRAID Plugin: Fix bug when no volume configured.
+
+* Fri Jun 19 2015 Gris Ge <fge@redhat.com> 1.2.1-1
+- New upstream release 1.2.1.
+- New sub-pacakges:
+    * libstoragemgmt-megaraid-plugin
+        New plugin in 1.2.0 release.
+    * libstoragemgmt-hpsa-plugin
+        New plugin in 1.2.0 release.
+- Add bash-completion script for lsmcli.
+- New rpmbuild switch: '--without test'
+    Use to skip 'make check' test to save debug time.
+- Remove PyYAML BuildRequires.
+- Add NEWS(changelog) to document folder.
+- 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.
+- Remove incorrect script for libstoragemgmt-rest package.
+- Add script to restart lsmd daemon on plugin install and remove.
+
 * Sun Sep 7 2014 Tony Asleson <tasleson@redhat.com> - 1.0.0-1
 - New upstream release
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Thu Jul 3 2014 Tony Asleson <tasleson@redhat.com> - 0.1.0-1
-- New upstream release
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.24-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+- Added udev handling
 
 * Thu Jan 30 2014 Tony Asleson <tasleson@redhat.com> 0.0.24-1
 - New upstream release
@@ -475,3 +706,4 @@ fi
 
 * Mon Feb 6 2012 Tony Asleson <tasleson@redhat.com>  0.0.1alpha-1
 - Initial version of package
+

sources

@@ -1 +1 @@
-0a19ed429b920221086b41b025e8219a  libstoragemgmt-1.0.0.tar.gz
+SHA512 (libstoragemgmt-1.6.1.tar.gz) = 9296e01b9f46feab004e3243af800d5123589ec4262d5be1cb220375977fe60a0e943d6ad8f2575796c7718d99bbf2d2a320ac4bfad666b27fecdc224ef00939