[openlmi-providers/f20] Version 0.4.0

Tomas Bzatek tbzatek at fedoraproject.org
Tue Oct 15 15:55:31 UTC 2013 

commit c4c0ddc4296da00e7ee42a983f2bb5826c7bedf8
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Tue Oct 15 17:55:17 2013 +0200

    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
    - Added documentation for software.

 .gitignore             |    1 +
 openlmi-providers.spec |  173 ++++++++++++++++++----
 sources                |    2 +-
 sphinx-theme.patch     |  394 ------------------------------------------------
 4 files changed, 148 insertions(+), 422 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 230c9db..3dd5189 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /openlmi-providers-0.1.1.tar.gz
 /openlmi-providers-0.2.0.tar.gz
 /openlmi-providers-0.3.0.tar.gz
+/openlmi-providers-0.4.0.tar.gz
diff --git a/openlmi-providers.spec b/openlmi-providers.spec
index 2f095cf..f3d250f 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:        3%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Set of basic CIM providers
 
 License:        LGPLv2+
@@ -11,7 +11,7 @@ URL:            http://fedorahosted.org/openlmi/
 Source0:        http://fedorahosted.org/released/openlmi-providers/%{name}-%{version}.tar.gz
 
 # Upstream name has been changed from cura-providers to openlmi-providers
-Provides:       cura-providers%{?_isa} = %{version}-%{release}
+Provides:       cura-providers = %{version}-%{release}
 Obsoletes:      cura-providers < 0.0.10-1
 
 BuildRequires:  cmake
@@ -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
@@ -46,8 +48,6 @@ Requires(pre):  pywbem
 Requires(preun): pywbem
 Requires(post):  pywbem
 
-Patch1: sphinx-theme.patch
-
 # XXX
 # Just because we have wired python's scripts
 # Remove in future
@@ -62,7 +62,7 @@ Model (CIM).
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       konkretcmpi-python >= %{required_konkret_ver}
-Provides:       cura-providers-devel%{?_isa} = %{version}-%{release}
+Provides:       cura-providers-devel = %{version}-%{release}
 Obsoletes:      cura-providers-devel < 0.0.10-1
 
 %description devel
@@ -71,7 +71,7 @@ Obsoletes:      cura-providers-devel < 0.0.10-1
 %package -n openlmi-fan
 Summary:        CIM provider for controlling fans
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Provides:       cura-fan%{?_isa} = %{version}-%{release}
+Provides:       cura-fan = %{version}-%{release}
 Obsoletes:      cura-fan < 0.0.10-1
 
 %description -n openlmi-fan
@@ -84,7 +84,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       upower
 # For Linux_ComputerSystem
 Requires:       sblim-cmpi-base
-Provides:       cura-powermanagement%{?_isa} = %{version}-%{release}
+Provides:       cura-powermanagement = %{version}-%{release}
 Obsoletes:      cura-powermanagement < 0.0.10-1
 
 %description -n openlmi-powermanagement
@@ -94,18 +94,26 @@ Obsoletes:      cura-powermanagement < 0.0.10-1
 %package -n openlmi-service
 Summary:        CIM provider for controlling system services
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Provides:       cura-service%{?_isa} = %{version}-%{release}
+Provides:       cura-service = %{version}-%{release}
 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}
 # For Linux_ComputerSystem
 Requires:       sblim-cmpi-base
-Provides:       cura-account%{?_isa} = %{version}-%{release}
+Provides:       cura-account = %{version}-%{release}
 Obsoletes:      cura-account < 0.0.10-1
 
 %description -n openlmi-account
@@ -174,6 +182,14 @@ through yum package manager with Common Information Managemen (CIM) protocol.
 The providers can be registered in any CMPI-aware CIMOM, both OpenPegasus and
 SFCB were tested.
 
+%package -n openlmi-software-doc
+Summary:        CIM software provider documentation
+Group:          Documentation
+BuildArch:      noarch
+
+%description -n openlmi-software-doc
+This package contains the documents for OpenLMI software provider.
+
 %package -n openlmi-logicalfile
 Summary:        CIM provider for reading files and directories
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -182,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}
@@ -191,9 +215,17 @@ Requires:       sblim-cmpi-base
 
 %description -n openlmi-realmd
 The openlmi-realmd package contains CMPI providers for Realmd, which is an on
-demand system DBus service, which allows callers to configure network
+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}
@@ -204,6 +236,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 %package -n openlmi-indicationmanager-libs-devel
 Summary:        Development files for openlmi-indicationmanager-libs
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       openlmi-indicationmanager-libs%{_isa} = %{version}-%{release}
 
 %description -n openlmi-indicationmanager-libs-devel
 %{summary}.
@@ -218,25 +251,17 @@ Requires:       python-pcp
 
 %description -n openlmi-pcp
 openlmi-pcp exposes metrics from a local PMCD (Performance Co-Pilot server)
-to the CIMOM.  They appear as potentially hundreds of MOF classes, e.g.
+to the CIMOM.  They appear as potentially hundreds of MOF classes, e.g. 
 class "PCP_Metric_kernel__pernode__cpu__use", with instances for each PCP
 metric instance, e.g. "node0".  PCP metric values and metadata are transcribed
 into strings on demand.
 
-%package -n python-sphinx-theme-openlmi
-Summary:        OpenLMI theme for Sphinx documentation generator
-Requires:       python-sphinx
-BuildArch:      noarch
-
-%description -n python-sphinx-theme-openlmi
-python-sphinx-theme-openlmi contains Sphinx theme for OpenLMI provider
-documentation.
-
 %package -n openlmi
 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
@@ -250,9 +275,27 @@ OpenLMI provides a common infrastructure for the management of Linux systems.
 This package installs a core set of OpenLMI providers and necessary
 infrastructure packages enabling the system to be managed remotely.
 
+%package -n python-sphinx-theme-openlmi
+Summary:        OpenLMI theme for Sphinx documentation generator
+Requires:       python-sphinx
+BuildArch:      noarch
+
+%description -n python-sphinx-theme-openlmi
+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
-%patch1 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -276,6 +319,10 @@ popd
 
 # documentation
 PATH="$PATH:`pwd`/tools" make -C src/account/doc html
+PATH="$PATH:`pwd`/tools" make -C src/software/doc/admin html
+PATH="$PATH:`pwd`/tools" make -C src/realmd/doc html
+PATH="$PATH:`pwd`/tools" make -C src/service-dbus/doc html
+PATH="$PATH:`pwd`/tools" make -C src/logicalfile/doc html
 
 %install
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
@@ -317,17 +364,31 @@ sed -i -e 's,^_LOCALSTATEDIR=.*,_LOCALSTATEDIR="%{_localstatedir}",' \
     $RPM_BUILD_ROOT/%{_bindir}/openlmi-pcp-generate \
     $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/openlmi-pcp
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}
+touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}/60_LMI_PCP_PMNS.mof
+touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}/60_LMI_PCP_PMNS.reg
+touch $RPM_BUILD_ROOT/%{_localstatedir}/lib/%{name}/stamp
 
 # documentation
 install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/account/admin_guide
+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
 cp -pr tools/openlmitheme/* $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/openlmitheme/
 
+
 %files
-%doc README COPYING
+%doc %{_docdir}/%{name}/README
+%doc %{_docdir}/%{name}/COPYING
 %dir %{_datadir}/%{name}
 %config(noreplace) %{_sysconfdir}/openlmi/openlmi.conf
 %{_datadir}/%{name}/05_LMI_Qualifiers.mof
@@ -338,6 +399,7 @@ cp -pr tools/openlmitheme/* $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/open
 %ghost %logfile
 
 %files devel
+%doc README COPYING
 %{_bindir}/openlmi-doc-class2rst
 %{_bindir}/openlmi-doc-class2uml
 %{_libdir}/libopenlmicommon.so
@@ -373,6 +435,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
@@ -417,13 +482,15 @@ cp -pr tools/openlmitheme/* $RPM_BUILD_ROOT/%{python_sitelib}/sphinx/themes/open
 %{python_sitelib}/lmi/software/*
 %{python_sitelib}/openlmi_software-*
 %{_libexecdir}/pegasus/pycmpiLMI_Software-cimprovagt
-
 %{_datadir}/%{name}/60_LMI_Software.mof
 %{_datadir}/%{name}/60_LMI_Software_MethodParameters.mof
 %{_datadir}/%{name}/70_LMI_SoftwareIndicationFilters.mof
 %{_datadir}/%{name}/90_LMI_Software_Profile.mof
 %{_datadir}/%{name}/LMI_Software.reg
 
+%files -n openlmi-software-doc
+%{_docdir}/%{name}/software/admin_guide
+
 %files -n openlmi-pcp
 %doc README COPYING
 %{_datadir}/%{name}/60_LMI_PCP.mof
@@ -445,6 +512,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
@@ -453,20 +523,33 @@ 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.*
 
 %files -n openlmi-indicationmanager-libs-devel
+%doc COPYING src/indmanager/README
 %{_libdir}/libopenlmiindmanager.so
 %{_libdir}/pkgconfig/openlmiindmanager.pc
 %{_includedir}/openlmi/ind_manager.h
 
+%files -n openlmi
+%doc COPYING README
+
 %files -n python-sphinx-theme-openlmi
+%doc COPYING README
 %{python_sitelib}/sphinx/themes/openlmitheme/
 
-%files -n openlmi
-%doc COPYING README
+%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
@@ -543,7 +626,7 @@ if [ "$1" -gt 1 ]; then
         %{_datadir}/%{name}/90_LMI_Software_Profile.mof || :;
     %{_bindir}/openlmi-mof-register --just-mofs -c tog-pegasus unregister \
         %{_datadir}/%{name}/60_LMI_Software_MethodParameters.mof || :;
-    %{_bindir}/openlmi-mof-register -v %{version} unregister
+    %{_bindir}/openlmi-mof-register -v %{version} unregister \
         %{_datadir}/%{name}/60_LMI_Software.mof \
         %{_datadir}/%{name}/LMI_Software.reg || :;
 fi >> %logfile 2>&1
@@ -584,6 +667,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
@@ -671,6 +763,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
@@ -758,7 +859,25 @@ 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 at 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
+- Added documentation for software.
+
 * Tue Oct 15 2013 Radek Novacek <rnovacek at redhat.com> 0.3.0-3
 - Add openlmi metapackage
 
diff --git a/sources b/sources
index 989e155..cabab03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1424cb277ab821fd0ddb5df04505997b  openlmi-providers-0.3.0.tar.gz
+89ee922b00cfbb346c49161cbe0225e3  openlmi-providers-0.4.0.tar.gz

More information about the scm-commits mailing list