bumped version to 0.2.8 and udpated spec file

1 files changed, 121 insertions, 133 deletions

diff --git a/openlmi-scripts.spec b/openlmi-scripts.spec
index c32da65..3aaad64 100644
--- a/openlmi-scripts.spec
+++ b/openlmi-scripts.spec
@@ -1,12 +1,12 @@
 %global         commit e29c72de5a461b208e06ef34d4e1143a717c9703
 %global         shortcommit %(c=%{commit}; echo ${c:0:7})
-%global         openlmi_scripts_version 0.2.7
-%global         commands logicalfile service software storage hardware
-%global         commands %{commands} networking system account powermanagement
+%global         commands account hardware journald logicalfile networking
+%global         commands %{commands} powermanagement service software storage
+%global         commands %{commands} system
 
 Name:           openlmi-scripts
-Version:        %{openlmi_scripts_version}
-Release:        5%{?dist}
+Version:        0.2.8
+Release:        1%{?dist}
 Summary:        Client-side python modules and command line utilities
 
 License:        BSD
@@ -19,37 +19,75 @@ BuildRequires:  python2-devel
 BuildRequires:  python-docopt
 BuildRequires:  python-sphinx
 BuildRequires:  python-sphinx-theme-openlmi
-BuildRequires:  openlmi-tools >= 0.9
+BuildRequires:  openlmi-tools >= 0.9.1
 BuildRequires:  python-IPy
-Requires:       python2
-Requires:       openlmi-providers >= 0.4.0
-Requires:       openlmi-python-base >= 0.3.0
-Requires:       python-docopt >= 0.6.1
-Requires:       openlmi-tools >= 0.9
+
+Requires:       %{name}-account         = %{version}-%{release}
+Requires:       %{name}-hardware        = %{version}-%{release}
+Requires:       %{name}-journald        = %{version}-%{release}
+Requires:       %{name}-logicalfile     = %{version}-%{release}
+Requires:       %{name}-networking      = %{version}-%{release}
+Requires:       %{name}-powermanagement = %{version}-%{release}
+Requires:       %{name}-service         = %{version}-%{release}
+Requires:       %{name}-software        = %{version}-%{release}
+Requires:       %{name}-storage         = %{version}-%{release}
+Requires:       %{name}-system          = %{version}-%{release}
 
 %description
-Client-side python modules and command line utilities.
+Client-side python modules and command line utilities for OpenLMI providers.
+
+%package        account
+Summary:        Client scripts for OpenLMI Account provider
+Requires:       openlmi-tools >= 0.9.1
+
+%description    account
+This packages contains client side python library for OpenLMI Account
+provider and command line wrapper.
+
+%package        hardware
+Summary:        Client scripts for OpenLMI Hardware provider
+Requires:       openlmi-tools >= 0.9.1
+
+%description    hardware
+This packages contains client side python library for OpenLMI Hardware
+provider and command line wrapper.
 
-%package        doc
-Summary:        OpenLMI scripts documentation
-Group:          Documentation
+%package        journald
+Summary:        Client scripts for OpenLMI Journald provider
+Requires:       openlmi-tools >= 0.9.1
 
-%description    doc
-This package contains the documents for OpenLMI Scripts.
+%description    journald
+This packages contains client side python library for OpenLMI Journald
+provider and command line wrapper.
 
 %package        logicalfile
 Summary:        Client scripts for OpenLMI Logical File provider
-Version:        0.0.3
-Requires:       %{name} = %{openlmi_scripts_version}-%{release}
+Requires:       openlmi-tools >= 0.9.1
 
 %description    logicalfile
 This packages contains client side python library for OpenLMI Logical File
 provider and command line wrapper.
 
+%package        networking
+Summary:        Client scripts for OpenLMI Networking provider
+Requires:       openlmi-tools >= 0.9.1
+Requires:       python-IPy
+
+%description    networking
+This packages contains client side python library for OpenLMI Networking
+provider and command line wrapper.
+
+%package        powermanagement
+Summary:        Client scripts for OpenLMI Power provider
+Requires:       openlmi-tools >= 0.9.1
+
+%description    powermanagement
+This packages contains client side python library for OpenLMI PowerManagement
+provider and command line wrapper.
+
 %package        service
 Summary:        Client scripts for OpenLMI Service provider
-Version:        0.1.2
-Requires:       %{name} = %{openlmi_scripts_version}-%{release}
+Requires:       openlmi-tools >= 0.9.1
 
 %description    service
 This packages contains client side python library for OpenLMI Service
@@ -57,8 +95,7 @@ provider and command line wrapper.
 
 %package        software
 Summary:        Client scripts for OpenLMI Software provider
-Version:        0.2.5
-Requires:       %{name} = %{openlmi_scripts_version}-%{release}
+Requires:       openlmi-tools >= 0.9.1
 
 %description    software
 This packages contains client side python library for OpenLMI Software
@@ -66,174 +103,125 @@ provider and command line wrapper.
 
 %package        storage
 Summary:        Client scripts for OpenLMI Storage provider
-Version:        0.0.4
-Requires:       %{name} = %{openlmi_scripts_version}-%{release}
+Requires:       openlmi-tools >= 0.9.1
 
 %description    storage
 This packages contains client side python library for OpenLMI Storage
 provider and command line wrapper.
 
-%package        hardware
-Summary:        Client scripts for OpenLMI Hardware provider
-Version:        0.0.3
-Requires:       %{name} = %{openlmi_scripts_version}-%{release}
-
-%description    hardware
-This packages contains client side python library for OpenLMI Hardware
-provider and command line wrapper.
-
-%package        networking
-Summary:        Client scripts for OpenLMI Networking provider
-Version:        0.0.2
-Requires:       %{name} = %{openlmi_scripts_version}-%{release}
-Requires:       python-IPy
-
-%description    networking
-This packages contains client side python library for OpenLMI Networking
-provider and command line wrapper.
-
 %package        system
 Summary:        Client scripts providing general system informations
-Version:        0.0.2
-Requires:       %{name} = %{openlmi_scripts_version}-%{release}
+Requires:       openlmi-tools >= 0.9.1
 
 %description    system
 This package contains client side python library for few OpenLMI providers and
-command line wrapper. It's aimed to provide some general informations about
+command line wrapper. It's aimed to provide some general information about
 system.
 
-%package        account
-Summary:        Client scripts for OpenLMI Account provider
-Version:        0.0.1
-Requires:       %{name} = %{openlmi_scripts_version}-%{release}
-
-%description    account
-This packages contains client side python library for OpenLMI Account
-provider and command line wrapper.
-
-%package        powermanagement
-Summary:        Client scripts for OpenLMI Power provider
-Version:        0.0.1
-Requires:       %{name} = %{openlmi_scripts_version}-%{release}
-
-%description    powermanagement
-This packages contains client side python library for OpenLMI PowerManagement
-provider and command line wrapper.
 
 %prep
 %setup -qn %{name}-%{commit}
 
 %build
-%{__python} setup.py build
+COMMANDS="%{commands}" make setup-all
 for cmd in %{commands}; do
     pushd commands/$cmd
     %{__python} setup.py build
+    cd doc
+    make html
+    [ -e _build/html/.buildinfo ] && rm _build/html/.buildinfo
     popd
 done
-make -C man
-INCLUDE_COMMANDS=1 COMMANDS="%{commands}" make -C doc html
 
 %install
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 for cmd in %{commands}; do
     pushd commands/$cmd
     %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+    install -m 0755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}-$cmd
+    cp -rp doc/_build/html $RPM_BUILD_ROOT/%{_docdir}/%{name}-$cmd
+    install -m 0644 README.md ../../COPYING \
+            $RPM_BUILD_ROOT/%{_docdir}/%{name}-$cmd
     popd
 done
-# copy init module for namespace package
-# without it the imports from eggs installed to user directory would not work
-cp -p lmi/scripts/__init__.* $RPM_BUILD_ROOT%{python_sitelib}/lmi/scripts
-
-# install config file
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/openlmi/scripts
-install -m 0644 config/lmi.conf $RPM_BUILD_ROOT%{_sysconfdir}/openlmi/scripts
-
-# install man page
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 0644 man/lmi.1.gz $RPM_BUILD_ROOT%{_mandir}/man1
-
-# install bash completion
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-install -m 0644 completion/lmi.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/lmi-bash-completion
-install -m 0755 completion/lmi-bash-completion/print_possible_commands.sh \
-     $RPM_BUILD_ROOT%{_libexecdir}/lmi-bash-completion
-cp -pr completion/lmi-bash-completion/commands \
-    $RPM_BUILD_ROOT%{_libexecdir}/lmi-bash-completion
 
 # install documentation
-install -m 755 -d $RPM_BUILD_ROOT%{_docdir}/%{name}/html
-cp -pr doc/_build/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}/html
-install -m 644 README.md COPYING Changelog $RPM_BUILD_ROOT/%{_docdir}/%{name}
+install -m 755 -d $RPM_BUILD_ROOT%{_docdir}/%{name}
+install -m 644 README.md COPYING $RPM_BUILD_ROOT/%{_docdir}/%{name}
 
 %files
 %doc %{_docdir}/%{name}/README.md
 %doc %{_docdir}/%{name}/COPYING
-%doc %{_docdir}/%{name}/Changelog
-%{_bindir}/lmi
-%dir %{_sysconfdir}/openlmi/scripts
-%config(noreplace) %{_sysconfdir}/openlmi/scripts/lmi.conf
-%{_sysconfdir}/bash_completion.d/lmi.bash
-%dir %{_libexecdir}/lmi-bash-completion
-%dir %{_libexecdir}/lmi-bash-completion/commands
-%{_libexecdir}/lmi-bash-completion/*.sh
-%{_libexecdir}/lmi-bash-completion/commands/_help
-%dir %{python_sitelib}/lmi/scripts
-%{python_sitelib}/lmi/scripts/__init__.py*
-%{python_sitelib}/lmi/scripts/common
-%{python_sitelib}/lmi/scripts/_metacommand
-%{python_sitelib}/openlmi_scripts-*
-%{_mandir}/man1/lmi.1.gz
-
-%files doc
-%{_docdir}/%{name}/html
+
+%files account
+%doc %{_docdir}/%{name}-account/
+%{python_sitelib}/lmi/scripts/account/
+%{python_sitelib}/openlmi_scripts_account-*
+
+%files hardware
+%doc %{_docdir}/%{name}-hardware/
+%{python_sitelib}/lmi/scripts/hardware/
+%{python_sitelib}/openlmi_scripts_hardware-*
+
+%files journald
+%doc %{_docdir}/%{name}-journald/
+%{python_sitelib}/lmi/scripts/journald/
+%{python_sitelib}/openlmi_scripts_journald-*
 
 %files logicalfile
-%doc commands/logicalfile/README.md COPYING
+%doc %{_docdir}/%{name}-logicalfile/
 %{python_sitelib}/lmi/scripts/logicalfile/
 %{python_sitelib}/openlmi_scripts_logicalfile-*
 
+%files networking
+%doc %{_docdir}/%{name}-networking/
+%{python_sitelib}/lmi/scripts/networking/
+%{python_sitelib}/openlmi_scripts_networking-*
+
+%files powermanagement
+%doc %{_docdir}/%{name}-powermanagement/
+%{python_sitelib}/lmi/scripts/powermanagement/
+%{python_sitelib}/openlmi_scripts_powermanagement-*
+
 %files service
-%doc commands/service/README.md COPYING
+%doc %{_docdir}/%{name}-service/
 %{python_sitelib}/lmi/scripts/service/
 %{python_sitelib}/openlmi_scripts_service-*
 
 %files software
-%doc commands/software/README.md COPYING
+%doc %{_docdir}/%{name}-software/
 %{python_sitelib}/lmi/scripts/software/
 %{python_sitelib}/openlmi_scripts_software-*
 
 %files storage
-%doc commands/storage/README.md COPYING
+%doc %{_docdir}/%{name}-storage/
 %{python_sitelib}/lmi/scripts/storage/
 %{python_sitelib}/openlmi_scripts_storage-*
 
-%files hardware
-%doc commands/hardware/README.md COPYING
-%{python_sitelib}/lmi/scripts/hardware/
-%{python_sitelib}/openlmi_scripts_hardware-*
-
-%files networking
-%doc commands/networking/README.md COPYING
-%{python_sitelib}/lmi/scripts/networking/
-%{python_sitelib}/openlmi_scripts_networking-*
-
 %files system
-%doc commands/system/README.md COPYING
+%doc %{_docdir}/%{name}-system/
 %{python_sitelib}/lmi/scripts/system/
 %{python_sitelib}/openlmi_scripts_system-*
 
-%files account
-%doc commands/account/README.md COPYING
-%{python_sitelib}/lmi/scripts/account/
-%{python_sitelib}/openlmi_scripts_account-*
+%changelog
+* Thu Apr 24 2014 Michal Minar <miminar@redhat.com> 0.2.8-1
+- Meta-command is not shipped any more (moved to openlmi-tools).
+- Base package now just groups script subpackages.
+- Particular subpackages now depend just on openlmi-tools.
+- Added journald scripts.
 
-%files powermanagement
-%doc commands/powermanagement/README.md COPYING
-%{python_sitelib}/lmi/scripts/powermanagement/
-%{python_sitelib}/openlmi_scripts_powermanagement-*
+* Mon Mar 10 2014 Michal Minar <miminar@redhat.com> 0.2.7-8
+- Fixed listing of thin volumes/groups in provides.
+- Smart hostname selection when no hosts are given.
+- System command improvements.
+- Fixed storage error reporting.
+
+* Wed Mar 05 2014 Michal Minar <miminar@redhat.com> 0.2.7-7
+- Fixed few networking bugs.
+- Fixed duplicate headers.
+
+* Tue Mar 04 2014 Michal Minar <miminar@redhat.com> 0.2.7-6
+- Fixed search command of software scripts.
 
-%changelog
 * Wed Feb 26 2014 Michal Minar <miminar@redhat.com> 0.2.7-5
 - Fixed error handling in service scripts.
 - Updated documentation for built-ins commands.