[boom] Latest upstream.

Ralph Bean ralph at fedoraproject.org
Wed Dec 17 01:32:14 UTC 2014


commit 478e68dcf216bb1fdadcfa4995d4f1d53267f404
Author: Ralph Bean <rbean at redhat.com>
Date:   Tue Dec 16 20:32:03 2014 -0500

    Latest upstream.

 .gitignore           |    1 +
 boom-unittest2.patch |   26 ++++++++++++++++++++++++++
 boom.spec            |   21 +++++++++++++++++----
 sources              |    2 +-
 4 files changed, 45 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 291e0d2..85430eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /boom-0.5.tar.gz
+/boom-0.8.tar.gz
diff --git a/boom-unittest2.patch b/boom-unittest2.patch
new file mode 100644
index 0000000..2eca555
--- /dev/null
+++ b/boom-unittest2.patch
@@ -0,0 +1,26 @@
+From 64b48c2f997d46c856094c9ec66d9581f7517cd9 Mon Sep 17 00:00:00 2001
+From: Ralph Bean <rbean at redhat.com>
+Date: Tue, 16 Dec 2014 20:22:53 -0500
+Subject: [PATCH] unittest2
+
+---
+ boom/tests/test_boom.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/boom/tests/test_boom.py b/boom/tests/test_boom.py
+index ae6b8dd..01e250c 100644
+--- a/boom/tests/test_boom.py
++++ b/boom/tests/test_boom.py
+@@ -1,4 +1,8 @@
+-import unittest2 as unittest
++try:
++    import unittest2 as unittest
++except ImportError:
++    import unittest
++
+ import subprocess
+ import sys
+ import shlex
+-- 
+2.1.0
+
diff --git a/boom.spec b/boom.spec
index cc0d6c7..65a0416 100644
--- a/boom.spec
+++ b/boom.spec
@@ -1,6 +1,6 @@
 Name:               boom
-Version:            0.5
-Release:            4%{?dist}
+Version:            0.8
+Release:            1%{?dist}
 Summary:            Simple HTTP Load tester
 
 Group:              Development/Tools
@@ -9,6 +9,7 @@ Group:              Development/Tools
 License:            ASL 2.0
 URL:                http://pypi.python.org/pypi/boom
 Source0:            http://pypi.python.org/packages/source/b/boom/boom-%{version}.tar.gz
+Patch0:             boom-unittest2.patch
 
 BuildArch:          noarch
 
@@ -17,9 +18,14 @@ BuildRequires:      python-setuptools
 BuildRequires:      python-gevent
 BuildRequires:      python-requests
 BuildRequires:      python-nose
+BuildRequires:      python-unittest2
+
 Requires:           python-gevent
 Requires:           python-requests
 
+# XXX - Temporary:  https://github.com/tarekziade/boom/pull/46
+Requires:           python-unittest2
+
 # In case people search for it in this way
 Provides:           python-boom
 
@@ -34,6 +40,8 @@ behaviors.
 %prep
 %setup -q -n boom-%{version}
 
+%patch0 -p1
+
 # Remove bundled egg-info in case it exists
 rm -rf boom.egg-info
 
@@ -47,14 +55,19 @@ rm -rf boom.egg-info
 PYTHONPATH=$(pwd) nosetests
 
 %files
-# Note, no license file yet included.  See
-# https://github.com/tarekziade/boom/issues/14
+%license LICENSE
 %doc README.rst PKG-INFO
 %{python_sitelib}/boom/
 %{python_sitelib}/boom-%{version}*
 %{_bindir}/boom
 
 %changelog
+* Tue Dec 16 2014 Ralph Bean <rbean at redhat.com> - 0.8-1
+- Latest upstream.
+- Include license file.
+- Require python-unittest2
+- Try to patch out unittest2.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 4506c50..bb80249 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5083a65372c1522260b1df2e8e9ad105  boom-0.5.tar.gz
+fc93363ca7e0a3d545c2fb63ed40e0d4  boom-0.8.tar.gz


More information about the scm-commits mailing list