Release 0.4.00.4.0

Added journald provider and also missing doc subpackages.

Signed-off-by: Tomas Bzatek <tbzatek@redhat.com>

1 files changed, 100 insertions, 2 deletions

diff --git a/openlmi-providers.spec b/openlmi-providers.spec
index 2d58acd..a8420be 100644
--- a/openlmi-providers.spec
+++ b/openlmi-providers.spec
@@ -2,8 +2,8 @@
 %global required_konkret_ver 0.9.0-2
 
 Name:           openlmi-providers
-Version:        0.3.0
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Set of basic CIM providers
 
 License:        LGPLv2+
@@ -35,6 +35,8 @@ BuildRequires:  libudev-devel
 BuildRequires:  libselinux-devel
 # For openlmi-register-pegasus script
 Requires:       python2
+# for openlmi-journald
+BuildRequires:  systemd-devel
 # sblim-sfcb or tog-pegasus
 # (required to be present during install/uninstall for registration)
 Requires:       cim-server
@@ -98,6 +100,14 @@ Obsoletes:      cura-service < 0.0.10-1
 %description -n openlmi-service
 %{summary}.
 
+%package -n openlmi-service-doc
+Summary:        CIM service provider documentation
+Group:          Documentation
+BuildArch:      noarch
+
+%description -n openlmi-service-doc
+This package contains the documents for OpenLMI service provider.
+
 %package -n openlmi-account
 Summary:        CIM provider for managing accounts on system
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -188,6 +198,14 @@ Requires:       sblim-cmpi-base
 %description -n openlmi-logicalfile
 %{summary}.
 
+%package -n openlmi-logicalfile-doc
+Summary:        CIM logicalfile provider documentation
+Group:          Documentation
+BuildArch:      noarch
+
+%description -n openlmi-logicalfile-doc
+This package contains the documents for OpenLMI logicalfile provider.
+
 %package -n openlmi-realmd
 Summary:        CIM provider for Realmd
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -200,6 +218,14 @@ The openlmi-realmd package contains CMPI providers for Realmd, which is an on
 demand system DBus service, which allows callers to configure network 
 authentication and domain membership in a standard way.
 
+%package -n openlmi-realmd-doc
+Summary:        CIM Realmd provider documentation
+Group:          Documentation
+BuildArch:      noarch
+
+%description -n openlmi-realmd-doc
+This package contains the documents for OpenLMI Realmd provider.
+
 %package -n openlmi-indicationmanager-libs
 Summary:        Libraries for CMPI indication manager
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -235,6 +261,7 @@ Summary:        OpenLMI managed system software components
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
 Requires:       tog-pegasus
+# List of "safe" providers
 Requires:       openlmi-storage
 Requires:       openlmi-networking
 Requires:       openlmi-hardware
@@ -257,6 +284,16 @@ BuildArch:      noarch
 python-sphinx-theme-openlmi contains Sphinx theme for OpenLMI provider
 documentation.
 
+%package -n openlmi-journald
+Summary:        CIM provider for Journald
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       systemd-libs
+
+%description -n openlmi-journald
+The openlmi-journald package contains CMPI providers for systemd journald
+service, allowing listing, iterating through and writing new message log
+records.
+
 %prep
 %setup -q
 
@@ -282,6 +319,9 @@ popd
 # documentation
 make -C src/account/doc html
 make -C src/software/doc/admin html
+make -C src/realmd/doc html
+make -C src/service-dbus/doc html
+make -C src/logicalfile/doc html
 
 %install
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
@@ -333,6 +373,12 @@ cp README COPYING $RPM_BUILD_ROOT/%{_docdir}/%{name}
 cp -pr src/account/doc/build/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/account/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
+install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/realmd/admin_guide
+cp -pr src/realmd/doc/build/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/realmd/admin_guide
+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}/logicalfile/admin_guide
+cp -pr src/logicalfile/doc/build/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/logicalfile/admin_guide
 
 # sphinx theme
 install -m 755 -d $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/openlmitheme
@@ -388,6 +434,9 @@ cp -pr tools/openlmitheme/* $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/open
 %{_datadir}/%{name}/90_LMI_Service_Profile.mof
 %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Service-cimprovagt
 
+%files -n openlmi-service-doc
+%{_docdir}/%{name}/service/admin_guide
+
 %files -n openlmi-account
 %doc README COPYING
 %{_libdir}/cmpi/libcmpiLMI_Account.so
@@ -462,6 +511,9 @@ cp -pr tools/openlmitheme/* $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/open
 %{_datadir}/%{name}/90_LMI_LogicalFile_Profile.mof
 %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_LogicalFile-cimprovagt
 
+%files -n openlmi-logicalfile-doc
+%{_docdir}/%{name}/logicalfile/admin_guide
+
 %files -n openlmi-realmd
 %doc README COPYING
 %{_libdir}/cmpi/libcmpiLMI_Realmd.so
@@ -470,6 +522,9 @@ cp -pr tools/openlmitheme/* $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/open
 %{_datadir}/%{name}/90_LMI_Realmd_Profile.mof
 %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Realmd-cimprovagt
 
+%files -n openlmi-realmd-doc
+%{_docdir}/%{name}/realmd/admin_guide
+
 %files -n openlmi-indicationmanager-libs
 %doc COPYING src/indmanager/README
 %{_libdir}/libopenlmiindmanager.so.*
@@ -487,6 +542,14 @@ cp -pr tools/openlmitheme/* $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/open
 %doc COPYING README
 %{python_sitelib}/sphinx/themes/openlmitheme/
 
+%files -n openlmi-journald
+%doc README COPYING
+%{_libdir}/cmpi/libcmpiLMI_Journald.so
+%{_datadir}/%{name}/60_LMI_Journald.mof
+%{_datadir}/%{name}/60_LMI_Journald.reg
+%{_datadir}/%{name}/90_LMI_Journald_Profile.mof
+%attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Journald-cimprovagt
+
 %pre
 # If upgrading, deregister old version
 if [ "$1" -gt 1 ]; then
@@ -603,6 +666,15 @@ if [ "$1" -gt 1 ]; then
         %{_localstatedir}/lib/%{name}/60_LMI_PCP_PMNS.reg || :;
 fi >> %logfile 2>&1
 
+%pre -n openlmi-journald
+if [ "$1" -gt 1 ]; then
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
+        %{_datadir}/%{name}/60_LMI_Journald.mof \
+        %{_datadir}/%{name}/60_LMI_Journald.reg || :;
+    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+        %{_datadir}/%{name}/90_LMI_Journald_Profile.mof || :;
+fi >> %logfile 2>&1
+
 %post -n openlmi-fan
 # Register Schema and Provider
 if [ "$1" -ge 1 ]; then
@@ -690,6 +762,15 @@ if [ "$1" -ge 1 ]; then
         %{_localstatedir}/lib/%{name}/60_LMI_PCP_PMNS.reg || :;
 fi >> %logfile 2>&1
 
+%post -n openlmi-journald
+if [ "$1" -ge 1 ]; then
+    %{_bindir}/openlmi-mof-register -v %{version} register \
+        %{_datadir}/%{name}/60_LMI_Journald.mof \
+        %{_datadir}/%{name}/60_LMI_Journald.reg || :;
+    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus register \
+        %{_datadir}/%{name}/90_LMI_Journald_Profile.mof || :;
+fi >> %logfile 2>&1
+
 %preun -n openlmi-fan
 # Deregister only if not upgrading
 if [ "$1" -eq 0 ]; then
@@ -777,7 +858,24 @@ if [ "$1" -eq 0 ]; then
         %{_localstatedir}/lib/%{name}/60_LMI_PCP_PMNS.reg || :;
 fi >> %logfile 2>&1
 
+%preun -n openlmi-journald
+if [ "$1" -eq 0 ]; then
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
+        %{_datadir}/%{name}/60_LMI_Journald.mof \
+        %{_datadir}/%{name}/60_LMI_Journald.reg || :;
+    %{_bindir}/openlmi-mof-register --just-mofs -n root/interop -c tog-pegasus unregister \
+        %{_datadir}/%{name}/90_LMI_Journald_Profile.mof || :;
+fi >> %logfile 2>&1
+
 %changelog
+* Tue Oct 15 2013 Tomas Bzatek <tbzatek@redhat.com> 0.4.0-1
+- Version 0.4.0
+- New journald provider
+- Added documentation for service, logicalfile and realmd providers
+- Documentation foundation improvements
+- logicalfile and software misc. fixes
+- Use PG_ComputerSystem by default
+
 * Tue Oct 08 2013 Michal Minar <miminar@redhat.com> 0.3.0-2
 - Added documentation for software.