Update spec file with the new documentation structure.

1 files changed, 25 insertions, 12 deletions

diff --git a/openlmi-providers.spec b/openlmi-providers.spec
index 6768322..0cb577c 100644
--- a/openlmi-providers.spec
+++ b/openlmi-providers.spec
@@ -97,6 +97,13 @@ Obsoletes:      cura-powermanagement < 0.0.10-1
 %description -n openlmi-powermanagement
 %{summary}.
 
+%package -n openlmi-powermanagement-doc
+Summary:        Power management CIM provider documentation
+Group:          Documentation
+BuildArch:      noarch
+
+%description -n openlmi-powermanagement-doc
+This package contains the documents for OpenLMI power management provider.
 
 %package -n openlmi-service
 Summary:        CIM provider for controlling system services
@@ -148,6 +155,14 @@ Requires:       util-linux
 %description -n openlmi-hardware
 %{summary}.
 
+%package -n openlmi-hardware-doc
+Summary:        CIM hardware provider documentation
+Group:          Documentation
+BuildArch:      noarch
+
+%description -n openlmi-hardware-doc
+This package contains the documents for OpenLMI hardware provider.
+
 %package -n openlmi-python-base
 Summary:        Python namespace package for OpenLMI python projects
 Requires:       python-setuptools
@@ -318,7 +333,7 @@ pushd %{_target_platform}
 %{cmake} ..
 popd
 
-make -k %{?_smp_mflags} -C %{_target_platform}
+make -k %{?_smp_mflags} -C %{_target_platform} all doc
 
 pushd src/python
 %{__python} setup.py build
@@ -331,12 +346,6 @@ pushd src/pcp
 %{__python} setup.py build
 popd
 
-# documentation
-for provider in account fan logicalfile realmd service-dbus journald; do
-    make -C src/${provider}/doc html
-done
-make -C src/software/doc/admin html
-
 %install
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
@@ -384,14 +393,12 @@ touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}/stamp
 # documentation
 install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}
 install -m 644 README COPYING $RPM_BUILD_ROOT/%{_docdir}/%{name}
-for provider in account fan logicalfile realmd journald; do
+for provider in account fan hardware journald logicalfile power realmd software; do
     install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/${provider}/admin_guide
-    cp -pr src/${provider}/doc/build/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/${provider}/admin_guide
+    cp -pr %{_target_platform}/doc/admin/${provider}/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/${provider}/admin_guide
 done
 install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/service/admin_guide
-cp -pr src/service-dbus/doc/build/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/service/admin_guide
-install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/software/admin_guide
-cp -pr src/software/doc/admin/build/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/software/admin_guide
+cp -pr %{_target_platform}/doc/admin/service-dbus/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/service/admin_guide
 
 # sphinx theme
 install -m 755 -d $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/openlmitheme
@@ -445,6 +452,9 @@ cp -pr tools/openlmitheme/* $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/open
 %{_datadir}/%{name}/90_LMI_PowerManagement_Profile.mof
 %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_PowerManagement-cimprovagt
 
+%files -n openlmi-powermanagement-doc
+%{_docdir}/%{name}/power/
+
 %files -n openlmi-service
 %doc README COPYING
 %{_libdir}/cmpi/libcmpiLMI_Service.so
@@ -476,6 +486,9 @@ cp -pr tools/openlmitheme/* $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/open
 %{_datadir}/%{name}/90_LMI_Hardware_Profile_DMTF.mof
 %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Hardware-cimprovagt
 
+%files -n openlmi-hardware-doc
+%{_docdir}/%{name}/hardware/
+
 %files -n openlmi-python-base
 %doc README COPYING
 %dir %{python_sitelib}/lmi