Index: trunk/server/common/patches/ipython-do-not-require-gtk.patch
===================================================================
--- trunk/server/common/patches/ipython-do-not-require-gtk.patch	(revision 1739)
+++ 	(revision )
@@ -1,23 +1,0 @@
-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]
- 
Index: trunk/server/fedora/Makefile
===================================================================
--- trunk/server/fedora/Makefile	(revision 1739)
+++ trunk/server/fedora/Makefile	(revision 1740)
@@ -19,5 +19,5 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream_yum	= krb5 krb5.i686 httpd openssh 389-ds-base ipython
+upstream_yum	= krb5 krb5.i686 httpd openssh 389-ds-base
 hackage		= MonadCatchIO-mtl-0.3.0.1 cgi-3001.1.8.1 unix-handle-0.0.0
 upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
Index: trunk/server/fedora/specs/ipython.spec.patch
===================================================================
--- trunk/server/fedora/specs/ipython.spec.patch	(revision 1739)
+++ 	(revision )
@@ -1,29 +1,0 @@
---- ipython.spec	2010-10-13 04:25:52.000000000 -0400
-+++ ipython.spec.new	2010-11-13 10:00:18.000000000 -0500
-@@ -4,7 +4,7 @@
- 
- Name:           ipython
- Version:        0.10.1
--Release:        1%{?dist}
-+Release:        1%{?dist}.scripts.%{scriptsversion}
- Summary:        An enhanced interactive Python shell
- 
- Group:          Development/Libraries
-@@ -20,6 +20,9 @@
- Patch1:         %{name}-unbundle-external-module.patch
- # fix for #628742, published on github for inclusion into upstream
- Patch2:         ipython-0.10-pycolor-wrong-filename.patch
-+
-+Patch1000:      ipython-do-not-require-gtk.patch
-+
- BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- 
- BuildArch:      noarch
-@@ -114,6 +117,7 @@
- popd
- %patch1 -p1
- %patch2 -p1
-+%patch1000 -p1
- 
- # delete bundling libs
- pushd IPython/external