From 0885ddbe5f9650b8586eb2c2fb5b3ebacbf0a57a Mon Sep 17 00:00:00 2001
From: rdobuilder <dev@lists.rdoproject.org>
Date: Oct 12 2021 11:16:45 +0000
Subject: Update to 2.5.0


Related-to: https://review.rdoproject.org/r/q/Idbb293871396cb1429fc4f073c18f634e06855ad

---

diff --git a/.python-testtools.metadata b/.python-testtools.metadata
index 6c6c296..e4999f3 100644
--- a/.python-testtools.metadata
+++ b/.python-testtools.metadata
@@ -1 +1 @@
-8bda1ce51500bb55593eb094bf5bc2d6a4bc36e8  SOURCES/testtools-2.4.0.tar.gz
+02d838ee87e5d067117e76e56656363ee5ed4e7d  SOURCES/testtools-2.5.0.tar.gz
diff --git a/SPECS/python-testtools.spec b/SPECS/python-testtools.spec
index 3268f1b..f8508cc 100644
--- a/SPECS/python-testtools.spec
+++ b/SPECS/python-testtools.spec
@@ -18,21 +18,17 @@ framework.}
 # 2. python-fixtures with the tests disabled
 # 3. python-testscenarios
 # 4. python-testtools and python-fixtures with tests enabled
-%bcond_with tests
+%bcond_without tests
 %bcond_without docs
 
 Name:           python-%{pkgname}
-Version:        2.4.0
-Release:        8%{?dist}
+Version:        2.5.0
+Release:        2%{?dist}
 Summary:        Extensions to the Python unit testing framework
 
 License:        MIT
 URL:            https://launchpad.net/testtools
 Source0:        %pypi_source
-Patch0:         testtools-2.4.0-remove_backports.patch
-# Reported as:
-# https://github.com/testing-cabal/testtools/pull/293
-Patch1:         testtools-2.4.0-fix_py39_test.patch
 
 BuildArch:      noarch
 
@@ -40,7 +36,7 @@ BuildArch:      noarch
 
 %package -n python3-%{pkgname}
 Summary:        %{summary}
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  python3-devel
 BuildRequires:  %{py3_dist setuptools extras python-mimeparse pbr}
 %if %{with tests}
@@ -66,7 +62,6 @@ This package contains HTML documentation for %{name}.
 %prep
 %autosetup -p 1 -n %{srcname}-%{version}
 rm -rf %{eggname}.egg-info
-rm testtools/_compat2x.py
 
 
 %build
@@ -99,6 +94,18 @@ make PYTHON=%{__python3} check
 
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jul 16 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 2.5.0-1
+- Update to 2.5.0
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.4.0-10
+- Rebuilt for Python 3.10
+
+* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 2.4.0-9
+- Bootstrap for Python 3.10
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild