[openlmi-networking] Version 0.2.0

[Radek Novacek]

commit 442dfcf9b735fee52871270f41b5ec395c70fefe
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Tue Oct 15 08:39:27 2013 +0200

    Version 0.2.0
    
    - Add -doc subpackage
    - Remove dependency on sblim-cmpi-base

 .gitignore              |    1 +
 openlmi-networking.spec |   41 +++++++++++++++++++++++++++--------------
 sources                 |    2 +-
 3 files changed, 29 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 94ff338..9cb3243 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /openlmi-networking-0.0.9.tar.gz
 /openlmi-networking-0.1.0.tar.gz
 /openlmi-networking-0.1.1.tar.gz
+/openlmi-networking-0.2.0.tar.gz
diff --git a/openlmi-networking.spec b/openlmi-networking.spec
index c4d706e..343535c 100644
--- a/openlmi-networking.spec
+++ b/openlmi-networking.spec
@@ -1,16 +1,13 @@
 %global logfile %{_localstatedir}/log/openlmi-install.log
 
 Name:           openlmi-networking
-Version:        0.1.1
-Release:        3%{?dist}
+Version:        0.2.0
+Release:        1%{?dist}
 Summary:        CIM providers for network management
 
 License:        LGPLv2+
 URL:            http://fedorahosted.org/openlmi/
 Source0:        http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
-Patch0:         openlmi-networking-0.1.1-fix-cql-in-indicationfilters.patch
-Patch1:         openlmi-networking-0.1.1-fix-for-schema-newer-than-2.33.patch
-Patch2:         openlmi-networking-0.1.1-fix-crash-when-uknown-connection-found.patch
 
 # Upstream name has been changed from cura-networking to openlmi-networking
 Provides:       cura-networking%{?_isa} = %{version}-%{release}
@@ -25,6 +22,7 @@ BuildRequires:  glib2-devel
 BuildRequires:  check-devel
 BuildRequires:  NetworkManager-glib-devel
 BuildRequires:  libuuid-devel
+BuildRequires:  python-sphinx-theme-openlmi
 
 # For openlmi-register-pegasus script
 Requires:       python2
@@ -32,22 +30,23 @@ Requires:       python2
 Requires:       cim-server
 # Require openlmi-providers because of registration scripts
 Requires:       openlmi-providers >= 0.1.0
-# For Linux_ComputerSystem class
-Requires:       sblim-cmpi-base
 
 %description
 %{name} is set of CMPI providers for network management using
 Common Information Model (CIM).
 
+%package doc
+Summary:        Documentation for %{name}
+BuildArch:      noarch
+# We explicitly don't require openlmi-networking installed, someone might want
+# just to read the documentation on different machine.
+
+%description doc
+%{summary}.
+
 
 %prep
 %setup -q
-# Fix CQL in indication filters
-%patch0 -p1
-# Fix for CIM schema > 2.33
-%patch1 -p1
-# Fix crash when unknown connection found
-%patch2 -p1
 
 
 %build
@@ -57,11 +56,16 @@ pushd %{_target_platform}
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
+make doc %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
-
+# install the docs
+install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/admin_guide/pic/
+cp -r %{_target_platform}/doc/admin/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/admin_guide/
+# We might not have pictures (test builds on buildbot), ignore the failure
+cp -r doc/admin/pic/*.svg $RPM_BUILD_ROOT/%{_docdir}/%{name}/admin_guide/pic/ || :
 
 %files
 %doc README COPYING
@@ -72,6 +76,10 @@ make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 %{_datadir}/%{name}/60_LMI_Networking.reg
 %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Networking-cimprovagt
 
+%files doc
+%doc README COPYING
+%{_docdir}/%{name}/admin_guide
+
 
 %pre
 # If upgrading, deregister old version
@@ -117,6 +125,11 @@ fi >> %logfile 2>&1
 
 
 %changelog
+* Mon Oct 14 2013 Radek Novacek <rnovacek at redhat.com> 0.2.0-1
+- Version 0.2.0
+- Add -doc subpackage
+- Remove dependency on sblim-cmpi-base
+
 * Wed Sep 18 2013 Radek Novacek <rnovacek at redhat.com> 0.1.1-3
 - Fix crash when unknown connection found
 
diff --git a/sources b/sources
index 0c2db15..412461f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5b64c05416cf9c4d529ce41830b51e6  openlmi-networking-0.1.1.tar.gz
+906ac263a3e73067d8b237b2fcc84b5b  openlmi-networking-0.2.0.tar.gz