From d8d50725d9db4f28b6ebd69097738022809c0093ea02861d3316dcbba162fb45 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin
Date: Thu, 3 Apr 2014 20:04:02 +0000
Subject: [PATCH 1/2] Accepting request 228876 from Cloud:OpenStack:Master
- update to 3.1:
* Fix an issue that prevented importing pexpect on Python 3 when ``sys.stdout``
was reassigned
* Improve prompt synchronisation in :mod:`~pexpect.pxssh`
* Fix pickling exception instances
* Fix handling exceptions from :func:`select.select` on Python 3
* A new :ref:`unicode API ` was introduced.
* Python 3 is now supported, using a single codebase.
* Pexpect now requires at least Python 2.6 or 3.2.
* The modules other than pexpect, such as :mod:`pexpect.fdpexpect` and
* Ignoring ``SIGHUP`` is now optional
OBS-URL: https://build.opensuse.org/request/show/228876
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pexpect?expand=0&rev=16
---
pexpect-2.4.tar.gz | 3 --
pexpect-3.1.tar.gz | 3 ++
python-pexpect-2.3.patch | 67 ----------------------------------------
python-pexpect.changes | 15 +++++++++
python-pexpect.spec | 6 ++--
5 files changed, 21 insertions(+), 73 deletions(-)
delete mode 100644 pexpect-2.4.tar.gz
create mode 100644 pexpect-3.1.tar.gz
delete mode 100644 python-pexpect-2.3.patch
diff --git a/pexpect-2.4.tar.gz b/pexpect-2.4.tar.gz
deleted file mode 100644
index 9442f8f..0000000
--- a/pexpect-2.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43c788f59dcf4bed677fd0b16891787dbf747e210ffedb6e90156fbbbd4d3b7b
-size 113251
diff --git a/pexpect-3.1.tar.gz b/pexpect-3.1.tar.gz
new file mode 100644
index 0000000..b8df97d
--- /dev/null
+++ b/pexpect-3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd0045066718fba98481032303f07565cca6b22b3b7f104efe3e077a55e9ee8d
+size 130404
diff --git a/python-pexpect-2.3.patch b/python-pexpect-2.3.patch
deleted file mode 100644
index 86e5e3d..0000000
--- a/python-pexpect-2.3.patch
+++ /dev/null
@@ -1,67 +0,0 @@
----
- MANIFEST.in | 15 +++++++++++++++
- setup.py | 28 +++++++++++++++++++++++++++-
- 2 files changed, 42 insertions(+), 1 deletion(-)
-
---- /dev/null
-+++ b/MANIFEST.in
-@@ -0,0 +1,15 @@
-+include ANSI.py
-+include fdpexpect.py
-+include FSM.py
-+include INSTALL
-+include LICENSE
-+include Makefile
-+include MANIFEST.in
-+include pexpect.py
-+include pxssh.py
-+include PKG-INFO
-+include README
-+include screen.py
-+include setup.py
-+recursive-include doc *
-+recursive-include examples *
---- a/setup.py
-+++ b/setup.py
-@@ -3,7 +3,27 @@ $Revision: 485 $
- $Date: 2007-07-12 15:23:15 -0700 (Thu, 12 Jul 2007) $
- '''
- from distutils.core import setup
--setup (name='pexpect',
-+from distutils.command.bdist_rpm import bdist_rpm
-+
-+NAME = "python-pexpect"
-+
-+def getdoc():
-+ import os
-+ result = ['INSTALL','LICENSE','README','PKG-INFO']
-+ list = os.listdir(os.path.join(os.curdir, 'doc'))
-+ for file in list:
-+ result.append(os.path.join('doc', file))
-+ return result
-+
-+def getexamples():
-+ import os
-+ result = []
-+ list = os.listdir(os.path.join(os.curdir, 'examples'))
-+ for file in list:
-+ result.append(os.path.join('examples', file))
-+ return result
-+
-+setup (name=NAME,
- version='2.3',
- py_modules=['pexpect', 'pxssh', 'fdpexpect', 'FSM', 'screen', 'ANSI'],
- description='Pexpect is a pure Python Expect. It allows easy control of other applications.',
-@@ -12,6 +32,12 @@ setup (name='pexpect',
- url='http://pexpect.sourceforge.net/',
- license='MIT license',
- platforms='UNIX',
-+ data_files = [("share/doc/packages/"+NAME, getdoc()),
-+ ("share/doc/packages/"+NAME+"/examples",getexamples())],
-+ cmdclass = {
-+ 'bdist_rpm': bdist_rpm
-+ }
-+
- )
-
- # classifiers = [
diff --git a/python-pexpect.changes b/python-pexpect.changes
index ae096c1..927bf8a 100644
--- a/python-pexpect.changes
+++ b/python-pexpect.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Apr 3 12:28:20 UTC 2014 - dmueller@suse.com
+
+- update to 3.1:
+ * Fix an issue that prevented importing pexpect on Python 3 when ``sys.stdout``
+ was reassigned
+ * Improve prompt synchronisation in :mod:`~pexpect.pxssh`
+ * Fix pickling exception instances
+ * Fix handling exceptions from :func:`select.select` on Python 3
+ * A new :ref:`unicode API ` was introduced.
+ * Python 3 is now supported, using a single codebase.
+ * Pexpect now requires at least Python 2.6 or 3.2.
+ * The modules other than pexpect, such as :mod:`pexpect.fdpexpect` and
+ * Ignoring ``SIGHUP`` is now optional
+
-------------------------------------------------------------------
Thu Oct 24 12:42:54 UTC 2013 - speilicke@suse.com
diff --git a/python-pexpect.spec b/python-pexpect.spec
index 1c1d79a..4d884e9 100644
--- a/python-pexpect.spec
+++ b/python-pexpect.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-pexpect
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: python-pexpect
BuildRequires: python-devel
-Version: 2.4
+Version: 3.1
Release: 0
Summary: Pure Python Expect-like module
License: MIT
@@ -49,10 +49,10 @@ python setup.py install --prefix="/usr" --root=%{buildroot}
%defattr(-,root,root,-)
%doc doc examples
%{python_sitelib}/ANSI.py*
+%{python_sitelib}/pexpect/
%{python_sitelib}/FSM.py*
%{python_sitelib}/fdpexpect.py*
%{python_sitelib}/pexpect-%{version}-py%{py_ver}.egg-info
-%{python_sitelib}/pexpect.py*
%{python_sitelib}/pxssh.py*
%{python_sitelib}/screen.py*
From 07729a96a051445809de3d523cdfc7f47a155f18eb057db63b347ae13e9367e1 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin
Date: Sat, 12 Apr 2014 17:56:04 +0000
Subject: [PATCH 2/2] Accepting request 229706 from Cloud:OpenStack:Master
- fix license (ISC)
OBS-URL: https://build.opensuse.org/request/show/229706
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pexpect?expand=0&rev=17
---
python-pexpect.changes | 5 +++++
python-pexpect.spec | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/python-pexpect.changes b/python-pexpect.changes
index 927bf8a..c5a791c 100644
--- a/python-pexpect.changes
+++ b/python-pexpect.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr 11 08:37:18 UTC 2014 - dmueller@suse.com
+
+- fix license (ISC)
+
-------------------------------------------------------------------
Thu Apr 3 12:28:20 UTC 2014 - dmueller@suse.com
diff --git a/python-pexpect.spec b/python-pexpect.spec
index 4d884e9..105432a 100644
--- a/python-pexpect.spec
+++ b/python-pexpect.spec
@@ -21,7 +21,7 @@ BuildRequires: python-devel
Version: 3.1
Release: 0
Summary: Pure Python Expect-like module
-License: MIT
+License: ISC
Group: Development/Libraries/Python
Url: http://pexpect.sourceforge.net/
Source: https://pypi.python.org/packages/source/p/pexpect/pexpect-%{version}.tar.gz