[openlmi-tools/f20] upgrade to 0.9.1

Wed Apr 16 13:28:58 UTC 2014

commit b9dd310f38f550b4e57632757feb0d3317ec9f03
Author: Peter Hatina <phatina at redhat.com>
Date:   Wed Apr 16 15:25:37 2014 +0200

    upgrade to 0.9.1

 .gitignore                                         |   10 +-
 openlmi-tools-01-fix-instance-deletion.patch       |   13 -
 ...s-02-fix-passing-instances-to-method-call.patch |   13 -
 openlmi-tools-03-fix-instance-comparision.patch    |   49 ---
 openlmi-tools-04-fix-passing-method-params.patch   |   65 ----
 openlmi-tools-05-fix-log-messages-connect.patch    |  127 -------
 openlmi-tools-06-fix-unify-lmishell-naming.patch   |   81 ----
 openlmi-tools-07-fix-interactive-connect.patch     |   93 -----
 ...ols-08-fix-compulsory-call-order-listener.patch |   40 --
 ...09-fix-blocking-when-receiving-indication.patch |   32 --
 openlmi-tools-10-fix-indication-unique-name.patch  |   36 --
 openlmi-tools-11-update-documentation.patch        |  383 --------------------
 ...tools-12-simplify-indication-subscription.patch |  159 --------
 openlmi-tools-13-drop-verification-callback.patch  |   70 ----
 openlmi-tools.spec                                 |   69 ++--
 sources                                            |    2 +-
 16 files changed, 40 insertions(+), 1202 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 2ffded5..cc4d467 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1 @@
-/openlmi-tools-0.1.tar.gz
-/openlmi-tools-0.2.tar.gz
-/openlmi-tools-0.3.tar.gz
-/openlmi-tools-0.4.tar.gz
-/openlmi-tools-0.5.tar.gz
-/openlmi-tools-0.6.tar.gz
-/openlmi-tools-0.7.tar.gz
-/openlmi-tools-0.8.tar.gz
-/openlmi-tools-0.9.tar.gz
+/openlmi-tools-0.9.1.tar.gz
diff --git a/openlmi-tools.spec b/openlmi-tools.spec
index 4904a73..4716050 100644
--- a/openlmi-tools.spec
+++ b/openlmi-tools.spec
@@ -1,24 +1,11 @@
 Name:           openlmi-tools
-Version:        0.9
-Release:        16%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        Set of CLI tools for Openlmi providers
 
 License:        GPLv2+
 URL:            http://fedorahosted.org/openlmi
 Source0:        http://fedorahosted.org/released/openlmi-tools/%{name}-%{version}.tar.gz
-Patch0:         openlmi-tools-01-fix-instance-deletion.patch
-Patch1:         openlmi-tools-02-fix-passing-instances-to-method-call.patch
-Patch2:         openlmi-tools-03-fix-instance-comparision.patch
-Patch3:         openlmi-tools-04-fix-passing-method-params.patch
-Patch4:         openlmi-tools-05-fix-log-messages-connect.patch
-Patch5:         openlmi-tools-06-fix-unify-lmishell-naming.patch
-Patch6:         openlmi-tools-07-fix-interactive-connect.patch
-Patch7:         openlmi-tools-08-fix-compulsory-call-order-listener.patch
-Patch8:         openlmi-tools-09-fix-blocking-when-receiving-indication.patch
-Patch9:         openlmi-tools-10-fix-indication-unique-name.patch
-Patch10:        openlmi-tools-11-update-documentation.patch
-Patch11:        openlmi-tools-12-simplify-indication-subscription.patch
-Patch12:        openlmi-tools-13-drop-verification-callback.patch
 BuildArch:      noarch
 
 BuildRequires:  automake
@@ -28,9 +15,17 @@ BuildRequires:  pywbem >= 0.7.0-20.20131121svn626
 BuildRequires:  pyOpenSSL
 BuildRequires:  python-sphinx
 BuildRequires:  python-sphinx-theme-openlmi
+BuildRequires:  openlmi-python-base
+# meta command
+BuildRequires:  ImageMagick
+BuildRequires:  pyparsing
+BuildRequires:  python-docopt
 Requires:       pywbem >= 0.7.0-20.20131121svn626
 Requires:       openlmi-python-base
 Requires:       pyOpenSSL
+# meta command
+Requires:       python-docopt >= 0.6.1
+Requires:       pyparsing
 
 Provides:       cura-tools = %{version}-%{release}
 Obsoletes:      cura-tools < 0.1-4
@@ -40,25 +35,13 @@ Obsoletes:      cura-tools < 0.1-4
 
 %package doc
 Summary:        Documentation for %{name}
+Group:          Documentation
 
 %description doc
 %{summary}
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
 
 %build
 pushd cli
@@ -67,24 +50,38 @@ popd # cli
 
 pushd doc
 make html man
+rm build/html/.buildinfo
 popd # doc
 
 %install
 pushd cli
 %{__python} setup.py install --skip-build -O1 --root %{buildroot}
+# lmi.scripts is a namespace package - setuptools omits its init module
+cp -p lmi/scripts/__init__.* %{buildroot}%{python_sitelib}/lmi/scripts
 popd # cli
 install -m 755 -d %{buildroot}/%{_docdir}/%{name}-%{version}
-install -m 644 README %{buildroot}/%{_docdir}/%{name}-%{version}
+install -m 644 README.md %{buildroot}/%{_docdir}/%{name}-%{version}
 install -m 644 COPYING %{buildroot}/%{_docdir}/%{name}-%{version}
 install -m 755 -d %{buildroot}/%{_mandir}/man1
 install -m 755 -d %{buildroot}/%{_docdir}/%{name}-%{version}
 install -m 644 doc/build/man/lmishell.1 %{buildroot}/%{_mandir}/man1/lmishell.1
+install -m 644 cli/man/lmi.1 %{buildroot}/%{_mandir}/man1/lmi.1
 cp -r doc/build/html %{buildroot}/%{_docdir}/%{name}-%{version}
 
+# install meta command's config file
+mkdir -p %{buildroot}%{_sysconfdir}/openlmi/scripts
+install -m 0644 cli/config/lmi.conf %{buildroot}%{_sysconfdir}/openlmi/scripts
+
 # completion for bash
 bash_comp_dir=%{buildroot}/%{_sysconfdir}/bash_completion.d
 install -m 755 -d $bash_comp_dir
 install -m 644 cli/completion/lmishell.bash $bash_comp_dir
+install -m 644 cli/completion/lmi.bash $bash_comp_dir
+mkdir -p %{buildroot}/%{_libexecdir}/lmi-bash-completion
+install -m 755 cli/completion/lmi-bash-completion/print_possible_commands.sh \
+        %{buildroot}%{_libexecdir}/lmi-bash-completion
+cp -pr cli/completion/lmi-bash-completion/commands \
+        %{buildroot}%{_libexecdir}/lmi-bash-completion
 
 # completion for zsh
 zsh_comp_dir=%{buildroot}/%{_datadir}/zsh/site-functions
@@ -92,17 +89,23 @@ install -m 755 -d $zsh_comp_dir
 install -m 644 cli/completion/_lmishell $zsh_comp_dir
 
 %files
-%doc %{_docdir}/%{name}-%{version}/README
+%doc %{_docdir}/%{name}-%{version}/README.md
 %doc %{_docdir}/%{name}-%{version}/COPYING
 %dir %{_docdir}/%{name}-%{version}
 %dir %{_datadir}/zsh/
 %dir %{_datadir}/zsh/site-functions/
 %dir %{_sysconfdir}/bash_completion.d/
+%dir %{_sysconfdir}/openlmi/scripts
+%config(noreplace) %{_sysconfdir}/openlmi/scripts/lmi.conf
 %attr(755,root,root) %{_bindir}/lmishell
+%attr(755,root,root) %{_bindir}/lmi
 %{_mandir}/man1/lmishell.1.gz
+%{_mandir}/man1/lmi.1.gz
 %{_datadir}/zsh/site-functions/_lmishell
-%{_sysconfdir}/bash_completion.d/lmishell.bash
+%{_sysconfdir}/bash_completion.d/*.bash
+%{_libexecdir}/lmi-bash-completion/
 %{python_sitelib}/lmi/shell/
+%{python_sitelib}/lmi/scripts/
 %{python_sitelib}/openlmi_tools-*
 
 %files doc
@@ -110,6 +113,10 @@ install -m 644 cli/completion/_lmishell $zsh_comp_dir
 %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Wed Apr 16 2014 Peter Hatina <phatina at redhat.com> - 0.9.1-1
+- upgrade to 0.9.1
+- lmi meta-command added
+
 * Thu Dec 19 2013 Peter Hatina <phatina at redhat.com> - 0.9-16
 - fix BuildRequires, Requires pywbem versions
 
diff --git a/sources b/sources
index 5d0e3e4..db185ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-889ad34ee1a22df54e048812031e9852  openlmi-tools-0.9.tar.gz
+e4079db18a0f2d5b01c4bc6d1a524d08  openlmi-tools-0.9.1.tar.gz
