[openlmi-providers] new upstream version 0.2.0

Wed Aug 28 07:37:37 UTC 2013

commit 57c625c6a3f217f1cc3729c7d9e71abfa988bbd3
Author: Michal Minar <miminar at redhat.com>
Date:   Wed Aug 28 09:34:52 2013 +0200

    new upstream version 0.2.0

 .gitignore                                         |   12 +--
 openlmi-providers-0.0.22-fix-jobs-mof.patch        |   24 ---
 openlmi-providers-0.1.1-sfcb.patch                 |  167 --------------------
 ...iders-konkretcmpi-0.9.1-new-generated-api.patch |   82 ----------
 openlmi-providers.spec                             |   49 +++++--
 sources                                            |    2 +-
 6 files changed, 41 insertions(+), 295 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 1b8ad17..083b670 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,2 @@
-/openlmi-providers-0.0.15.tar.gz
-/openlmi-providers-0.0.16.tar.gz
-/openlmi-providers-0.0.17.tar.gz
-/openlmi-providers-0.0.18.tar.gz
-/openlmi-providers-0.0.19.tar.gz
-/openlmi-providers-0.0.20.tar.gz
-/openlmi-providers-0.0.21.tar.gz
-/openlmi-providers-0.0.22.tar.gz
-/openlmi-providers-0.0.23.tar.gz
-/openlmi-providers-0.0.25.tar.gz
-/openlmi-providers-0.1.0.tar.gz
 /openlmi-providers-0.1.1.tar.gz
+/openlmi-providers-0.2.0.tar.gz
diff --git a/openlmi-providers.spec b/openlmi-providers.spec
index 898683a..7f052a0 100644
--- a/openlmi-providers.spec
+++ b/openlmi-providers.spec
@@ -1,23 +1,21 @@
 %global logfile %{_localstatedir}/log/openlmi-install.log
+%global required_konkret_ver 0.9.0-2
 
 Name:           openlmi-providers
-Version:        0.1.1
-Release:        2%{?dist}
+Version:        0.2.0
+Release:        1%{?dist}
 Summary:        Set of basic CIM providers
 
 License:        LGPLv2+
 URL:            http://fedorahosted.org/openlmi/
 Source0:        http://fedorahosted.org/released/openlmi-providers/%{name}-%{version}.tar.gz
 
-# bug#995561: don't register __MethodParameters classes into SFCB
-Patch1:         openlmi-providers-0.1.1-sfcb.patch
-
 # Upstream name has been changed from cura-providers to openlmi-providers
 Provides:       cura-providers%{?_isa} = %{version}-%{release}
 Obsoletes:      cura-providers < 0.0.10-1
 
 BuildRequires:  cmake
-BuildRequires:  konkretcmpi-devel >= 0.9.0-2
+BuildRequires:  konkretcmpi-devel >= %{required_konkret_ver}
 BuildRequires:  sblim-cmpi-devel
 BuildRequires:  cim-schema
 # For openlmi-power
@@ -27,6 +25,9 @@ BuildRequires:  lm_sensors-devel
 # For openlmi-account
 BuildRequires:  libuser-devel
 BuildRequires:  python2-devel
+# for openlmi-account-doc
+BuildRequires:  konkretcmpi-python >= %{required_konkret_ver}
+BuildRequires:  python-sphinx
 # For openlmi-hardware
 BuildRequires:  pciutils-devel
 # For openlmi-logicalfile
@@ -58,6 +59,7 @@ Model (CIM).
 %package devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       konkretcmpi-python >= %{required_konkret_ver}
 Provides:       cura-providers-devel%{?_isa} = %{version}-%{release}
 Obsoletes:      cura-providers-devel < 0.0.10-1
 
@@ -107,6 +109,14 @@ Obsoletes:      cura-account < 0.0.10-1
 %description -n openlmi-account
 %{summary}.
 
+%package -n openlmi-account-doc
+Summary:        CIM account provider documentation
+Group:          Documentation
+BuildArch:      noarch
+
+%description -n openlmi-account-doc
+This package contains the documents for OpenLMI account provider.
+
 %package -n openlmi-hardware
 Summary:        CIM provider for hardware on system
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -213,7 +223,6 @@ into strings on demand.
 
 %prep
 %setup -q
-%patch1 -p1 -b .sfcb
 
 %build
 mkdir -p %{_target_platform}
@@ -234,9 +243,16 @@ pushd src/pcp
 %{__python} setup.py build
 popd
 
+# documentation
+make -C src/account/doc html
+
 %install
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
+# The log file must be created
+mkdir -p "$RPM_BUILD_ROOT/%{_localstatedir}/log"
+touch "$RPM_BUILD_ROOT/%logfile"
+
 # XXX
 # Remove pythonies
 # Don't forget to remove this dirty hack in the future
@@ -271,6 +287,9 @@ sed -i -e 's,^_LOCALSTATEDIR=.*,_LOCALSTATEDIR="%{_localstatedir}",' \
     $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/openlmi-pcp
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}
 
+# documentation
+install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/account/admin_guide
+cp -pr src/account/doc/build/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/account/admin_guide
 
 %files
 %doc README COPYING
@@ -326,6 +345,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}
 %{_datadir}/%{name}/90_LMI_Account_Profile.mof
 %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Account-cimprovagt
 
+%files -n openlmi-account-doc
+%{_docdir}/%{name}/account/admin_guide
+
 %files -n openlmi-hardware
 %doc README COPYING
 %{_libdir}/cmpi/libcmpiLMI_Hardware.so
@@ -340,7 +362,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}
 %dir %{python_sitelib}/lmi
 %{python_sitelib}/lmi/__init__.py
 %{python_sitelib}/lmi/__init__.py[co]
-%{python_sitelib}/lmi-*
+%{python_sitelib}/openlmi-*
 %dir %{python_sitelib}/lmi/base
 %{python_sitelib}/lmi/base/*.py
 %{python_sitelib}/lmi/base/*.py[co]
@@ -357,7 +379,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}
 %config(noreplace) %{_sysconfdir}/openlmi/software/software.conf
 %config(noreplace) %{_sysconfdir}/openlmi/software/yum_worker_logging.conf
 %{python_sitelib}/lmi/software/*
-%{python_sitelib}/lmi_software-*
+%{python_sitelib}/openlmi_software-*
 %{_libexecdir}/pegasus/pycmpiLMI_Software-cimprovagt
 
 %{_datadir}/%{name}/60_LMI_Software.mof
@@ -371,7 +393,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}
 %{_datadir}/%{name}/60_LMI_PCP.mof
 %dir %{python_sitelib}/lmi/pcp
 %{python_sitelib}/lmi/pcp/*
-%{python_sitelib}/lmi_pcp-*
+%{python_sitelib}/openlmi_pcp-*
 %attr(755, root, root) %{_bindir}/openlmi-pcp-generate
 %attr(755, root, root) %{_sysconfdir}/cron.daily/openlmi-pcp
 %dir %{_localstatedir}/lib/%{name}
@@ -695,8 +717,15 @@ if [ "$1" -eq 0 ]; then
 fi >> %logfile 2>&1
 
 %changelog
+* Tue Aug 27 2013 Michal Minar <miminar at redhat.com> 0.2.0-1
+- Version 0.2.0
+- Enhancement in software api.
+- Added openlmi-account-doc package with admin guide.
+- Fixed installation of python packages.
+
 * Thu Aug 15 2013 Jan Safranek <jsafrane at redhat.com> 0.1.1-2
 - Fixed registration into SFCB (#995561)
+- Register __MethodParameters classes only in Pegasus
 
 * Wed Aug 07 2013 Radek Novacek <rnovacek at redhat.com> 0.1.1-1
 - Version 0.1.1
diff --git a/sources b/sources
index 284d04d..79bede4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c061603e9307fa5a76004fa90c220a07  openlmi-providers-0.1.1.tar.gz
+ca168c416a54696f420693d2bdefdbbd  openlmi-providers-0.2.0.tar.gz
