[openlmi-storage/f20] Update to new upstream version.

[Jan Šafránek]

commit acf2affce16c616c2301a1bc1ae486951789871f
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Thu Aug 29 16:47:01 2013 +0200

    Update to new upstream version.

 .gitignore           |    1 +
 openlmi-storage.spec |   46 ++++++++++++++++++++++++++++++++++------------
 sources              |    2 +-
 3 files changed, 36 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fbcedce..0e94eea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /openlmi-storage-0.5.1.tar.gz
 /openlmi-storage-0.5.2.tar.gz
 /openlmi-storage-0.5.3.tar.gz
+/openlmi-storage-0.6.0.tar.gz
diff --git a/openlmi-storage.spec b/openlmi-storage.spec
index d5f958f..4cce8ab 100644
--- a/openlmi-storage.spec
+++ b/openlmi-storage.spec
@@ -1,33 +1,31 @@
 %global logfile %{_localstatedir}/log/openlmi-install.log
 
 Name:           openlmi-storage
-Version:        0.5.3
-Release:        4%{?dist}
+Version:        0.6.0
+Release:        1
 Summary:        CIM providers for storage management
 
 License:        LGPLv2+
 URL:            http://fedorahosted.org/openlmi
 Source0:        https://fedorahosted.org/released/openlmi-storage/%{name}-%{version}.tar.gz
 BuildArch:      noarch
+BuildRequires:  python-setuptools
 BuildRequires:  python2-devel
+# To generate documentation
+BuildRequires:  python-sphinx
+
 Requires:       cmpi-bindings-pywbem
 Requires:       python-blivet
 Requires:       openlmi-python-providers
 # For Linux_ComputerSystem:
 Requires:       sblim-cmpi-base
 # For openlmi-mof-register script:
-Requires(pre):  openlmi-providers >= 0.1.0
-Requires(preun): openlmi-providers >= 0.1.0
-Requires(post): openlmi-providers >= 0.1.0
+Requires(pre):  openlmi-providers >= 0.2.0
+Requires(preun): openlmi-providers >= 0.2.0
+Requires(post): openlmi-providers >= 0.2.0
 # For LMI_LogicalFile:
 Requires:       openlmi-logicalfile
 
-Provides:       cura-storage = %{version}-%{release}
-Obsoletes:      cura-storage < 0:0.4.0-1
-
-# bug#995561: don't register __MethodParameters classes in SFCB
-Patch1:         openlmi-storage-0.5.3-sfcb.patch
-
 %description
 The openlmi-storage package contains CMPI providers for management of storage
 using Common Information Managemen (CIM) protocol.
@@ -35,6 +33,15 @@ using Common Information Managemen (CIM) protocol.
 The providers can be registered in any CMPI-aware CIMOM, both OpenPegasus and
 SFCB were tested.
 
+%package doc
+Summary:        Documentation for %{name}
+# We explicitly don't require openlmi-software installed, someone might want
+# just to read the documentation on different machine.
+
+%description doc
+%{summary}.
+
+
 %prep
 %setup -q
 
@@ -44,16 +51,24 @@ SFCB were tested.
 %install
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# MOF files
 install -m 755 -d $RPM_BUILD_ROOT/%{_datadir}/%{name}
 install -m 644 mof/* $RPM_BUILD_ROOT/%{_datadir}/%{name}/
 
+# Configuration file
 install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/openlmi/storage
 install -m 644 storage.conf $RPM_BUILD_ROOT/%{_sysconfdir}/openlmi/storage/storage.conf
 
+# SELinux wrapper
 install -m 755 -d $RPM_BUILD_ROOT/%{_libexecdir}/pegasus
 install -m 755 pycmpiLMI_Storage-cimprovagt $RPM_BUILD_ROOT/%{_libexecdir}/pegasus/
 
-rm $RPM_BUILD_ROOT/%{python_sitelib}/lmi/__init__.*
+# Documentation
+pushd doc/admin
+make html
+install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/admin_guide
+cp -r _build/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/admin_guide/
+popd
 
 %pre
 # If upgrading, deregister old version
@@ -123,8 +138,15 @@ fi >> %logfile 2>&1
 %config(noreplace,missingok) %{_sysconfdir}/openlmi/storage/storage.conf
 %{_libexecdir}/pegasus/pycmpiLMI_Storage-cimprovagt
 
+%files doc
+%{_docdir}/%{name}/admin_guide
 
 %changelog
+* Thu Aug 29 2013 Jan Safranek <jsafrane at redhat.com> - 0.6.0-1
+- New upstrem version.
+  - Added documentation to openlmi-storage-doc subpackage.
+  - Reworked logging.
+
 * Tue Aug 20 2013 Jan Safranek <jsafrane at redhat.com> - 0.5.3-4
 - Fixed dependency on openlmi-python-providers.
 
diff --git a/sources b/sources
index 4d9e794..4404389 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd83eff3a65825662c64f97501b6acc3  openlmi-storage-0.5.3.tar.gz
+16dc7e57ccedf5aaa8ec60d3493ce989  openlmi-storage-0.6.0.tar.gz