[spyder/f19] new upstream version 2.2.4 (#1010935)

[Tomas Hozza]

commit f1238ae8b019b30eff0308c2063646fea9619388
Author: Tomas Hozza <thozza at redhat.com>
Date:   Wed Sep 25 21:52:32 2013 +0200

    new upstream version 2.2.4 (#1010935)
    
    - Spyder failed to start and ended with EOFError (#1010568)
    
    Signed-off-by: Tomas Hozza <thozza at redhat.com>

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 ...-EOFError-when-reading-spyderproject-file.patch |   12 ++++++++++++
 spyder.spec                                        |   10 +++++++++-
 4 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index acf3eac..6f95354 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /spyder-2.2.0.zip
 /spyder-2.2.1.zip
 /spyder-2.2.2.zip
+/spyder-2.2.4.zip
diff --git a/sources b/sources
index 157098c..df6ef64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9baae9b92564510de63699079af8ee67  spyder-2.2.2.zip
+6a411564e2311d4b5e082f0f3875d224  spyder-2.2.4.zip
diff --git a/spyder-Handle-EOFError-when-reading-spyderproject-file.patch b/spyder-Handle-EOFError-when-reading-spyderproject-file.patch
new file mode 100644
index 0000000..e6c84b4
--- /dev/null
+++ b/spyder-Handle-EOFError-when-reading-spyderproject-file.patch
@@ -0,0 +1,12 @@
+diff -up spyder-2.2.4/spyderlib/widgets/projectexplorer.py.eoferror spyder-2.2.4/spyderlib/widgets/projectexplorer.py
+--- spyder-2.2.4/spyderlib/widgets/projectexplorer.py.eoferror	2013-09-25 22:20:50.204430201 +0200
++++ spyder-2.2.4/spyderlib/widgets/projectexplorer.py	2013-09-25 22:24:36.793801159 +0200
+@@ -123,7 +123,7 @@ class Project(object):
+             # Old format (Spyder 2.0-2.1 for Python 2)
+             with open(fname, 'U') as fdesc:
+                 data = cPickle.loads(fdesc.read())
+-        except TypeError, cPickle.PickleError:
++        except (EOFError, TypeError, cPickle.PickleError):
+             try:
+                 # New format (Spyder >=2.2 for Python 2 and Python 3)
+                 with open(fname, 'rb') as fdesc:
diff --git a/spyder.spec b/spyder.spec
index 1307c89..b3c67e3 100644
--- a/spyder.spec
+++ b/spyder.spec
@@ -1,5 +1,5 @@
 Name:		spyder
-Version:	2.2.2
+Version:	2.2.4
 Release:	1%{?dist}
 Summary:	Scientific Python Development Environment
 Source0:	http://spyderlib.googlecode.com/files/%{name}-%{version}.zip
@@ -14,6 +14,8 @@ Requires:	python-rope python-sphinx
 Requires:	hicolor-icon-theme
 BuildArch:	noarch
 
+Patch0: spyder-Handle-EOFError-when-reading-spyderproject-file.patch
+
 %description
 Spyder is a Python development environment with advanced editing, interactive
 testing, debugging and introspection features. It is especially recommended 
@@ -27,6 +29,8 @@ widgets.
 %prep
 %setup -q
 
+%patch0 -p1 -b .eoferror
+
 rm -rf PKG-INFO
 
 # Remove DOS line endings
@@ -71,6 +75,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/pixmaps/spyder.png
 
 %changelog
+* Wed Sep 25 2013 Tomas Hozza <thozza at redhat.com> 2.2.4-1
+- new upstream version 2.2.4 (#1010935)
+- Spyder failed to start and ended with EOFError (#1010568)
+
 * Fri Aug 16 2013 Radek Novacek <rnovacek at redhat.com> 2.2.2-1
 - Update to 2.2.2