[python-nose-progressive] Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4

[Bohuslav Kabrda]

commit e2ed70d8c3f9e924ee27b135ebf568dadcab05cc
Author: Slavek Kabrda <bkabrda at redhat.com>
Date:   Thu May 22 09:26:58 2014 +0200

    Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4

 ...e-progressive-fix-tracebacks-on-python3.4.patch |   51 ++++++++++++++++++++
 python-nose-progressive.spec                       |   10 +++-
 2 files changed, 59 insertions(+), 2 deletions(-)
---
diff --git a/python-nose-progressive-fix-tracebacks-on-python3.4.patch b/python-nose-progressive-fix-tracebacks-on-python3.4.patch
new file mode 100644
index 0000000..cd1fef7
--- /dev/null
+++ b/python-nose-progressive-fix-tracebacks-on-python3.4.patch
@@ -0,0 +1,51 @@
+From b834bdb9b834ef99863e42fa26c5b73f3d60160d Mon Sep 17 00:00:00 2001
+From: Robert Kuska <rkuska at redhat.com>
+Date: Tue, 20 May 2014 11:47:49 +0200
+Subject: [PATCH 1/2] Fixes template format to handle line_number properly if
+ its None
+
+---
+ noseprogressive/tracebacks.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/noseprogressive/tracebacks.py b/noseprogressive/tracebacks.py
+index e7c589e..5a218a6 100644
+--- a/noseprogressive/tracebacks.py
++++ b/noseprogressive/tracebacks.py
+@@ -41,7 +41,7 @@ def format_shortcut(editor,
+                         function=None):
+         """Return a pretty-printed editor shortcut."""
+         return template.format(editor=editor,
+-                               line_number=line_number,
++                               line_number=str(line_number),
+                                path=path,
+                                function=function or u'',
+                                hash_if_function=u'  # ' if function else u'',
+-- 
+1.9.3
+
+
+From 4b2f86617ff38e13955900f76fd5252d900c8b3d Mon Sep 17 00:00:00 2001
+From: Robert Kuska <rkuska at redhat.com>
+Date: Tue, 20 May 2014 11:55:42 +0200
+Subject: [PATCH 2/2] Alternative fix to proper handle line_number format
+
+---
+ noseprogressive/tracebacks.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/noseprogressive/tracebacks.py b/noseprogressive/tracebacks.py
+index 5a218a6..11488a3 100644
+--- a/noseprogressive/tracebacks.py
++++ b/noseprogressive/tracebacks.py
+@@ -41,7 +41,7 @@ def format_shortcut(editor,
+                         function=None):
+         """Return a pretty-printed editor shortcut."""
+         return template.format(editor=editor,
+-                               line_number=str(line_number),
++                               line_number=line_number or 0,
+                                path=path,
+                                function=function or u'',
+                                hash_if_function=u'  # ' if function else u'',
+-- 
+1.9.3
diff --git a/python-nose-progressive.spec b/python-nose-progressive.spec
index 844a59d..8e09f87 100644
--- a/python-nose-progressive.spec
+++ b/python-nose-progressive.spec
@@ -8,7 +8,7 @@
 
 Name:           python-%{upstream_name}
 Version:        1.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Nose plugin to show a progress bar and tracebacks during tests
 License:        GPLv2+
 URL:            https://github.com/erikrose/nose-progressive
@@ -16,6 +16,7 @@ Source0:        http://pypi.python.org/packages/source/n/%{upstream_name}/%{upst
 # LICENSE fetched from https://raw.githubusercontent.com/erikrose/nose-progressive/c2011a2b82408fe18e14476b7db7202135398d63/LICENSE
 # Pull request to include it in tarballs: https://github.com/erikrose/nose-progressive/pull/68
 Source1:        LICENSE
+Patch0:         %{name}-fix-tracebacks-on-python3.4.patch
 BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
@@ -58,6 +59,8 @@ a number of other human-centric features to speed the debugging process.
 cp -p %{SOURCE1} .
 rm -r nose_progressive.egg-info
 
+%patch0 -p1
+
 %if %{with python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
@@ -84,7 +87,7 @@ popd
 %check
 %if %{with python3}
 pushd %{py3dir}
-nosetests-3.3 build/lib
+nosetests-%{python3_version} build/lib
 popd
 %endif
 
@@ -103,6 +106,9 @@ popd
 %endif
 
 %changelog
+* Mon May 19 2014 Bohuslav Kabrda <bkabrda at redhat.com> - 1.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
+
 * Wed Apr 30 2014 Dan Callaghan <dcallagh at redhat.com> - 1.5.1-1
 - new upstream bug fix release 1.5.1 (license changed to MIT)