diff --git a/.gitignore b/.gitignore index 2db1be7..d70ed44 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /libstoragemgmt-0.0.20.tar.gz /libstoragemgmt-0.0.21.tar.gz /libstoragemgmt-0.0.22.tar.gz +/libstoragemgmt-0.0.23.tar.gz diff --git a/libstoragemgmt.spec b/libstoragemgmt.spec index 082cb8c..afb8841 100644 --- a/libstoragemgmt.spec +++ b/libstoragemgmt.spec @@ -1,5 +1,5 @@ Name: libstoragemgmt -Version: 0.0.22 +Version: 0.0.23 Release: 1%{?dist} Summary: Storage array management library Group: System Environment/Libraries @@ -8,7 +8,8 @@ URL: http://sourceforge.net/projects/libstoragemgmt/ Source0: http://sourceforge.net/projects/libstoragemgmt/files/libstoragemgmt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: yajl-devel libxml2-devel check-devel glib2-devel +BuildRequires: autoconf automake libtool yajl-devel libxml2-devel check-devel glib2-devel +BuildRequires: gcc-c++ Requires: %{name}-python %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 @@ -51,6 +52,7 @@ 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} BuildArch: noarch %description smis-plugin @@ -63,6 +65,7 @@ Summary: Files for NetApp array support for %{name} Group: System Environment/Libraries BuildRequires: m2crypto Requires: m2crypto %{name}-python +Requires: libstoragemgmt-python = %{version}-%{release} BuildArch: noarch %description netapp-plugin @@ -74,6 +77,7 @@ support. Summary: Files for targetd array support for %{name} Group: System Environment/Libraries Requires: %{name}-python +Requires: libstoragemgmt-python = %{version}-%{release} BuildArch: noarch %description targetd-plugin @@ -87,6 +91,7 @@ Summary: Files for IBM v7k array support for %{name} Group: System Environment/Libraries BuildRequires: python-paramiko Requires: python-paramiko %{name}-python +Requires: libstoragemgmt-python = %{version}-%{release} BuildArch: noarch %description ibm-v7k-plugin @@ -99,31 +104,35 @@ support. Summary: Files for NexentaStor array support for %{name} Group: System Environment/Libraries Requires: %{name}-python +Requires: libstoragemgmt-python = %{version}-%{release} BuildArch: noarch %description nstor-plugin The %{name}-nstor-plugin package contains plug-in for NexentaStor array support. +%package udev +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. + %prep %setup -q %build -#The version.py gets created so set the .py to match .py.in times -UpdateTimestamps(){ - touch -r lsm/lsm/version.py.in lsm/lsm/version.py -} +./autogen.sh #Tell the install program to preserve file date/timestamps %if 0%{?rhel} >= 7 -%configure --disable-static INSTALL_DATA="\${INSTALL} -p" --without-paramiko +%configure --disable-static --without-paramiko %else -%configure --disable-static INSTALL_DATA="\${INSTALL} -p" +%configure --disable-static %endif -UpdateTimestamps - -make %{?_smp_mflags} +V=1 make %{?_smp_mflags} %install rm -rf %{buildroot} @@ -146,6 +155,10 @@ install packaging/daemon/libstoragemgmtd %{buildroot}/etc/rc.d/init.d/libstorage #Need these to exist at install so we can start the daemon mkdir -p %{buildroot}%{_localstatedir}/run/lsm/ipc +mkdir -p %{buildroot}/lib/udev/rules.d +install -m 644 tools/udev/90-scsi-ua.rules %{buildroot}/lib/udev/rules.d/90-scsi-ua.rules +install -m 755 tools/udev/scan-scsi-target %{buildroot}/lib/udev/scan-scsi-target + %clean rm -rf %{buildroot} @@ -198,7 +211,6 @@ fi %{_libdir}/*.so.* %{_bindir}/lsmcli %{_bindir}/lsmd -%{_bindir}/sim_lsmplugin %{_bindir}/simc_lsmplugin %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 @@ -209,7 +221,7 @@ fi %dir %attr(0755, libstoragemgmt, libstoragemgmt) %{_localstatedir}/run/lsm/ipc %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 -%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf +%attr(0644, root, root) %{_sysconfdir}/tmpfiles.d/%{name}.conf %else %attr(0755, root, root) /etc/rc.d/init.d/libstoragemgmtd %endif @@ -251,6 +263,7 @@ fi %files targetd-plugin %defattr(-,root,root,-) +%{python_sitelib}/lsm/targetd.* %{_bindir}/targetd_lsmplugin @@ -265,8 +278,16 @@ fi %defattr(-,root,root,-) %{_bindir}/nstor_lsmplugin +%files udev +%defattr(-,root,root,-) +/lib/udev/scan-scsi-target +/lib/udev/rules.d/90-scsi-ua.rules + %changelog +* Wed Nov 27 2013 Tony Asleson 0.0.23-1 +- New upstream release + * Mon Aug 12 2013 Tony Asleson 0.0.22-1 - New upstream release diff --git a/sources b/sources index d4961c0..c2dccf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a652622b074f86e6d56eab7844b7fb56 libstoragemgmt-0.0.22.tar.gz +ea5ec877459a8574e0ea79fd9305b4e9 libstoragemgmt-0.0.23.tar.gz