From 89ecdd9836002ee67ef6eefc5eac602afac5d270 Mon Sep 17 00:00:00 2001
From: Toshio くらとみ <toshio@fedoraproject.org>
Date: Jun 21 2010 18:42:57 +0000
Subject: - Update patch for import in argparse


---

diff --git a/ipython-unbundle-external-module.patch b/ipython-unbundle-external-module.patch
index 25dc174..56cdf9d 100644
--- a/ipython-unbundle-external-module.patch
+++ b/ipython-unbundle-external-module.patch
@@ -2223,7 +2223,7 @@ Index: ipython-0.10/IPython/external/argparse/__init__.py
 ===================================================================
 --- /dev/null
 +++ ipython-0.10/IPython/external/argparse/__init__.py
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,11 @@
 +try:
 +    import argparse
 +    # Workaround an argparse bug
@@ -2232,6 +2232,7 @@ Index: ipython-0.10/IPython/external/argparse/__init__.py
 +        argparse.__all__ = list(itertools.chain( [i for i in argparse.__all__
 +            if i != 'RawTextHelpFormatterArgumentDefaultsHelpFormatter'],
 +            ['RawTextHelpFormatter', 'ArgumentDefaultsHelpFormatter']))
++    from argparse import *
 +except ImportError:
 +    from _argparse import *
 Index: ipython-0.10/IPython/external/argparse.py
@@ -4581,7 +4582,7 @@ Index: ipython-0.10/IPython/external/configobj/_configobj.py
 +
 +__version__ = '4.5.2'
 +
-+__revision__ = '$Id: ipython-unbundle-external-module.patch,v 1.1 2010/06/19 20:04:40 tomspur Exp $'
++__revision__ = '$Id: ipython-unbundle-external-module.patch,v 1.2 2010/06/21 18:42:57 toshio Exp $'
 +
 +__docformat__ = "restructuredtext en"
 +
@@ -7096,7 +7097,7 @@ Index: ipython-0.10/IPython/external/configobj.py
 -
 -__version__ = '4.5.2'
 -
--__revision__ = '$Id: ipython-unbundle-external-module.patch,v 1.1 2010/06/19 20:04:40 tomspur Exp $'
+-__revision__ = '$Id: ipython-unbundle-external-module.patch,v 1.2 2010/06/21 18:42:57 toshio Exp $'
 -
 -__docformat__ = "restructuredtext en"
 -
@@ -14726,7 +14727,7 @@ Index: ipython-0.10/IPython/external/validate.py
 -
 -__version__ = '0.3.2'
 -
--__revision__ = '$Id: ipython-unbundle-external-module.patch,v 1.1 2010/06/19 20:04:40 tomspur Exp $'
+-__revision__ = '$Id: ipython-unbundle-external-module.patch,v 1.2 2010/06/21 18:42:57 toshio Exp $'
 -
 -__all__ = (
 -    '__version__',
@@ -16145,7 +16146,7 @@ Index: ipython-0.10/IPython/external/validate/_validate.py
 +
 +__version__ = '0.3.2'
 +
-+__revision__ = '$Id: ipython-unbundle-external-module.patch,v 1.1 2010/06/19 20:04:40 tomspur Exp $'
++__revision__ = '$Id: ipython-unbundle-external-module.patch,v 1.2 2010/06/21 18:42:57 toshio Exp $'
 +
 +__all__ = (
 +    '__version__',
diff --git a/ipython.spec b/ipython.spec
index d054bfe..44fe712 100644
--- a/ipython.spec
+++ b/ipython.spec
@@ -4,7 +4,7 @@
 
 Name:           ipython
 Version:        0.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An enhanced interactive Python shell
 
 Group:          Development/Libraries
@@ -197,6 +197,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jun 21 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.10-4
+- Update patch for import in argparse
+
 * Fri Jun 11 2010 Thomas Spura <tomspur@fedoraproject.org> - 0.10-3
 - fix license tag (#603178)
 - add requires on wxpython to gui subpackage (#515570)