diff --git a/.gitignore b/.gitignore index 8d967f5..d45a048 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /libstoragemgmt-0.0.24.tar.gz /libstoragemgmt-0.1.0.tar.gz /libstoragemgmt-1.0.0.tar.gz +/libstoragemgmt-1.1.0.tar.gz diff --git a/libstoragemgmt.spec b/libstoragemgmt.spec index b792df3..0465e84 100644 --- a/libstoragemgmt.spec +++ b/libstoragemgmt.spec @@ -7,9 +7,15 @@ %global with_rest_api 0 } +%define udev_dir /lib +# Later versions moved /lib to /usr/lib +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?suse_version} +%define udev_dir /usr/lib +%endif + Name: libstoragemgmt -Version: 1.0.0 -Release: 3%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Storage array management library Group: System Environment/Libraries License: LGPLv2+ @@ -107,7 +113,7 @@ 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 @@ -158,11 +164,11 @@ install -m 0644 packaging/daemon/lsm-tmpfiles.conf \ mkdir -p %{buildroot}%{_localstatedir}/run/lsm/ipc #Files for udev handling -mkdir -p %{buildroot}/usr/lib/udev/rules.d +mkdir -p %{buildroot}/%{udev_dir}/udev/rules.d install -m 644 tools/udev/90-scsi-ua.rules \ - %{buildroot}/usr/lib/udev/rules.d/90-scsi-ua.rules + %{buildroot}/%{udev_dir}/udev/rules.d/90-scsi-ua.rules install -m 755 tools/udev/scan-scsi-target \ - %{buildroot}/usr/lib/udev/scan-scsi-target + %{buildroot}/%{udev_dir}/udev/scan-scsi-target %clean rm -rf %{buildroot} @@ -226,7 +232,9 @@ getent passwd libstoragemgmt >/dev/null || \ %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.* @@ -235,10 +243,13 @@ getent passwd libstoragemgmt >/dev/null || \ %{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.* @@ -246,15 +257,23 @@ getent passwd libstoragemgmt >/dev/null || \ %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 %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.* @@ -262,20 +281,22 @@ getent passwd libstoragemgmt >/dev/null || \ %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 %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 %files udev %defattr(-,root,root,-) -/usr/lib/udev/scan-scsi-target -/usr/lib/udev/rules.d/90-scsi-ua.rules +%{udev_dir}/udev/scan-scsi-target +%{udev_dir}/udev/rules.d/90-scsi-ua.rules %if 0%{?with_rest_api} %files rest @@ -285,6 +306,11 @@ getent passwd libstoragemgmt >/dev/null || \ %endif %changelog +* Thu Dec 4 2014 Tony Asleson 1.1.0-1 +- New upstream release +- Fix udev files directory +- Move command line files to python package + * Wed Oct 8 2014 Tony Asleson - 1.0.0-3 - Specify udev files to /usr/lib dir instead of /lib - Move command line python files to python package diff --git a/sources b/sources index db02950..03d8202 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a19ed429b920221086b41b025e8219a libstoragemgmt-1.0.0.tar.gz +ef4f82813df7996ec5cfcd2c68f23aef libstoragemgmt-1.1.0.tar.gz