From 607a52b11f4e3ae50f1ec84d79a4bf37e9388d4b Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Jul 28 2015 16:46:32 +0000 Subject: Make testtools usable on releases with older pbr --- diff --git a/python-testtools.spec b/python-testtools.spec index 8938671..788e533 100644 --- a/python-testtools.spec +++ b/python-testtools.spec @@ -14,12 +14,15 @@ License: MIT URL: https://launchpad.net/testtools Source0: http://pypi.python.org/packages/source/t/testtools/testtools-%{version}.tar.gz Patch0: testtools-1.8.0-py3.patch +# the only reason pbr >= 0.11 is needed at the moment +# is to generate the version tuple. generate it by hand instead. +Patch1: testtools-1.8.0-old_pbr.patch BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-extras BuildRequires: python-mimeparse >= 0.1.4 -BuildRequires: python-pbr >= 0.11 +BuildRequires: python-pbr BuildRequires: python-setuptools BuildRequires: python-unittest2 >= 0.8.0 BuildREquires: python-traceback2 @@ -27,7 +30,7 @@ BuildREquires: python-traceback2 BuildRequires: python3-devel BuildRequires: python3-extras BuildRequires: python3-mimeparse -BuildRequires: python3-pbr >= 0.11 +BuildRequires: python3-pbr BuildRequires: python3-setuptools BuildRequires: python3-unittest2 BuildRequires: python3-traceback2 @@ -75,6 +78,9 @@ This package contains HTML documentation for %{name}. %prep %setup -q -n testtools-%{version} +%if 0%{?fedora} < 23 +%patch1 -p1 -b .old_pbr +%endif %if 0%{?with_python3} rm -rf %{py3dir} diff --git a/testtools-1.8.0-old_pbr.patch b/testtools-1.8.0-old_pbr.patch new file mode 100644 index 0000000..5d17466 --- /dev/null +++ b/testtools-1.8.0-old_pbr.patch @@ -0,0 +1,9 @@ +--- testtools-1.8.0/testtools/__init__.py.old_pbr 2015-05-05 05:47:42.000000000 +0700 ++++ testtools-1.8.0/testtools/__init__.py 2015-07-28 23:41:39.881267500 +0700 +@@ -123,5 +123,5 @@ + # Otherwise it is major.minor.micro~$(revno). + from pbr.version import VersionInfo + _version = VersionInfo('testtools') +-__version__ = _version.semantic_version().version_tuple() + version = _version.release_string() ++__version__ = tuple(version.split('.') + ['final', 0])