From 7c4a7b56373dea42cfb215845a7352a9c331e131 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Jun 13 2014 15:32:43 +0000
Subject: Rebase el6 EPEL branch to 0.13.2 to fix unicode support (#767404)


- BuildRequires python-argparse
- BuildRequires python-nose1.1
- Disable Xvfb test for el6 EPEL branch

---

diff --git a/ipython.spec b/ipython.spec
index 1a06369..e70dbbe 100644
--- a/ipython.spec
+++ b/ipython.spec
@@ -54,8 +54,10 @@ BuildRequires:  PyQt4
 # for frontend
 BuildRequires:  python-pygments
 # for running qt/matplotlib tests
+%if ! (0%{?rhel} == 6)
 BuildRequires:  xorg-x11-server-Xvfb
 %endif
+%endif
 
 # Require $current_python_interpreter-ipython
 Requires:       python-ipython
@@ -381,6 +383,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} \
 popd
 %endif
 
+%if ! (0%{?rhel} == 6)
 # TODO no ipython in path in koji
 PYTHONPATH=%{buildroot}%{python_sitelib} \
     PATH="%{buildroot}%{_bindir}:$PATH" \
@@ -388,6 +391,7 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \
     xvfb-run \
     %{buildroot}%{_bindir}/iptest -v -e %{EXCLUDE_TESTS_2}
 %endif
+%endif
 
 %files -n python-ipython
 %defattr(-,root,root,-)
@@ -545,6 +549,7 @@ PYTHONPATH=%{buildroot}%{python_sitelib} \
 - Rebase el6 EPEL branch to 0.13.2 to fix unicode support (#767404)
 - BuildRequires python-argparse
 - BuildRequires python-nose1.1
+- Disable Xvfb test for el6 EPEL branch
 
 * Mon Oct  7 2013 Thomas Spura <tomspur@fedoraproject.org> - 0.13.2-3
 - install into unversioned docdir (#993848)