[ovirt-engine-cli/el6] Update to upstream 3.2.0.10

[Juan Hernandez]

commit 8e36a48af5037d68eb96a6aec75c5a59458ade56
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date:   Wed Feb 20 16:05:34 2013 +0100

    Update to upstream 3.2.0.10

 .gitignore                                         |    1 +
 ...ovirt-cli-DistributionNotFound-exception-.patch |   27 ++++++++++++++++++++
 ovirt-engine-cli.spec                              |   15 +++++++++-
 sources                                            |    2 +-
 4 files changed, 42 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 188bccb..40e09f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /ovirt-engine-cli-3.2.0.4.tar.xz
 /ovirt-engine-cli-3.2.0.5.tar.xz
 /ovirt-engine-cli-3.2.0.9.tar.xz
+/ovirt-engine-cli-3.2.0.10.tar.xz
diff --git a/0001-Revert-cli-ovirt-cli-DistributionNotFound-exception-.patch b/0001-Revert-cli-ovirt-cli-DistributionNotFound-exception-.patch
new file mode 100644
index 0000000..6e05d9c
--- /dev/null
+++ b/0001-Revert-cli-ovirt-cli-DistributionNotFound-exception-.patch
@@ -0,0 +1,27 @@
+From e54b0fd938b9d3f712fb85b0dc4ca5270e7bf95c Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Wed, 20 Feb 2013 15:59:42 +0100
+Subject: [PATCH] Revert "cli: ovirt-cli DistributionNotFound exception on f18
+ #881011"
+
+This reverts commit 6bc5c809a77b6a4242de469730760860ab313276.
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 0105f9a..05b148b 100755
+--- a/setup.py
++++ b/setup.py
+@@ -30,7 +30,7 @@ setup(
+                  'ovirtcli.platform', 'ovirtcli.platform.posix',
+                  'ovirtcli.platform.windows', 'ovirtcli.shell', 'ovirtcli.utils', 'cli',
+                  'cli.command', 'cli.platform', 'cli.platform.posix'],
+-    install_requires=[ 'ovirt-engine-sdk >= 3.2.0.3-SNAPSHOT', 'pexpect-u >= 2.3', 'ply >= 3.3', 'kitchen >= 1' ],
++    install_requires=[ 'ovirt-engine-sdk >= 3.2.0.3-SNAPSHOT', 'pexpect >= 2.3', 'ply >= 3.3', 'kitchen >= 1' ],
+     entry_points={ 'console_scripts': [ 'ovirt-shell = ovirtcli.main:main' ] },
+     **version_info
+ )
+-- 
+1.8.1.2
+
diff --git a/ovirt-engine-cli.spec b/ovirt-engine-cli.spec
index 55e7cd1..a16a6c0 100644
--- a/ovirt-engine-cli.spec
+++ b/ovirt-engine-cli.spec
@@ -1,5 +1,5 @@
 Name: ovirt-engine-cli
-Version: 3.2.0.9
+Version: 3.2.0.10
 Release: 1%{dist}
 Summary: oVirt Engine Command Line Interface
 Group: Development/Libraries
@@ -8,7 +8,7 @@ URL: http://ovirt.org
 
 # git clone git://gerrit.ovirt.org/ovirt-engine-cli
 # cd ovirt-engine-cli
-# git archive --prefix ovirt-engine-cli-3.2.0.9/ 3.2.0.9 | xz > ovirt-engine-cli-3.2.0.9.tar.xz
+# git archive --prefix ovirt-engine-cli-3.2.0.10/ 3.2.0.10 | xz > ovirt-engine-cli-3.2.0.10.tar.xz
 Source: %{name}-%{version}.tar.xz
 
 BuildRequires: python2-devel
@@ -27,11 +27,17 @@ Requires: python-kitchen
 
 Conflicts: python-cli
 
+# The upstream maintainer added a patch to use pexpect-u instead of
+# pexpect in order for things to work in Fedora 18, but this doesn't
+# work in el6 distributions, so we need to revert that change:
+Patch0: 0001-Revert-cli-ovirt-cli-DistributionNotFound-exception-.patch
+
 %description
 The command line interface for oVirt-Engine.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -58,6 +64,11 @@ popd
 %doc LICENSE
 
 %changelog
+* Wed Feb 20 2013 Juan <juan.hernandez at redhat.com> - 3.2.0.10-4
+- Update to upstream 3.2.0.10
+- Revert upstream change to use pexpect-u instead of pexpect, as the
+  former is not available in el6 distributions
+
 * Wed Jan 30 2013 Juan Hernandez <juan.hernandez at redhat.com> - 3.2.0.9-1
 - Update to upstream 3.2.0.9
 - Fix for #905359
diff --git a/sources b/sources
index 6f2c35b..d7f4172 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df4052ac20a0aad962ff785dfb658a3f  ovirt-engine-cli-3.2.0.9.tar.xz
+3289f86fe1198b520394d5607ea7e100  ovirt-engine-cli-3.2.0.10.tar.xz