From 3ad779ecc70e4655ba0fc98834e0325667f05d34 Mon Sep 17 00:00:00 2001
From: Thomas Spura <tomspur@fedoraproject.org>
Date: Apr 09 2011 09:18:17 +0000
Subject: - update to new version

- patch3 is included upstream
- fixes #663823, #649281

---

diff --git a/.gitignore b/.gitignore
index 0a3cb4a..b32a689 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 ipython-0.10.tar.gz
 /ipython-0.10.1.tar.gz
+/ipython-0.10.2.tar.gz
diff --git a/ipython-0.10-no-gtk.patch b/ipython-0.10-no-gtk.patch
deleted file mode 100644
index b05e4b8..0000000
--- a/ipython-0.10-no-gtk.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 8161523536289eaed01ca42707f6785f59343cd7
-Author: Fernando Perez <Fernando.Perez@berkeley.edu>
-Date:   Tue Oct 26 14:32:10 2010 -0700
-
-    Do not require GTK to be either present or usable to start.
-    
-    Before, we only checked that we could import GTK, but in a linux
-    console, it's possible to import it while not being able to start it
-    (no X11 present).
-    
-    This should resolve https://bugzilla.redhat.com/show_bug.cgi?id=646079
-    Thanks to Tom Spura for reporting it.
-
-diff --git a/IPython/Shell.py b/IPython/Shell.py
-index 9481099..38006d7 100644
---- a/IPython/Shell.py
-+++ b/IPython/Shell.py
-@@ -1152,7 +1152,8 @@ class IPShellMatplotlibQt4(IPShellQt4):
- def check_gtk(mode):
-     try:
-         import gtk
--    except ImportError:
-+    except (ImportError, RuntimeError):
-+        # GTK not present, or can't be started (no X11, happens in console)
-         return mode
-     if hasattr(gtk,'set_interactive'):
-         gtk.set_interactive(False)
-@@ -1243,7 +1244,8 @@ def _select_shell(argv):
-             th_mode = 'tkthread'
- 
-         # New versions of pygtk don't need the brittle threaded support.
--        th_mode = check_gtk(th_mode)
-+        if th_mode == 'gthread':
-+            th_mode = check_gtk(th_mode)
-         return th_shell[th_mode]
- 
- 
diff --git a/ipython.spec b/ipython.spec
index 7da9b82..b0d571f 100644
--- a/ipython.spec
+++ b/ipython.spec
@@ -3,8 +3,8 @@
 %endif
 
 Name:           ipython
-Version:        0.10.1
-Release:        4%{?dist}
+Version:        0.10.2
+Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
 Group:          Development/Libraries
@@ -21,9 +21,6 @@ Patch1:         %{name}-unbundle-external-module.patch
 # fix for #628742, will be in 0.11
 Patch2:         ipython-0.10-pycolor-wrong-filename.patch
 
-# fix for #646079, will be in 0.11
-Patch3:         ipython-0.10-no-gtk.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -120,7 +117,6 @@ mv validate.py validate/_validate.py
 popd
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # delete bundling libs
 pushd IPython/external
@@ -236,6 +232,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Apr  9 2011 Thomas Spura <tomspur@fedoraproject.org> - 0.10.2-1
+- update to new version
+- patch3 is included upstream
+- fixes #663823, #649281
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index b44f71b..0e3aeef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54ae47079b0e9a0998593a99ce76ec1f  ipython-0.10.1.tar.gz
+dda59bfc6e256ce786c4bc4aadb220a4  ipython-0.10.2.tar.gz