diff --git a/appease-django-320.patch b/appease-django-320.patch
deleted file mode 100644
index 46b69fb..0000000
--- a/appease-django-320.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 52a14d92a122665b1a101e6398eca3982de01739 Mon Sep 17 00:00:00 2001
-From: Chris Withers <chris@simplistix.co.uk>
-Date: Sat, 10 Apr 2021 19:42:20 +0100
-Subject: [PATCH] appease Django 3.2
-
----
- testfixtures/tests/test_django/settings.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/testfixtures/tests/test_django/settings.py b/testfixtures/tests/test_django/settings.py
-index cf960d7..5173650 100644
---- a/testfixtures/tests/test_django/settings.py
-+++ b/testfixtures/tests/test_django/settings.py
-@@ -6,3 +6,5 @@
- ]
- 
- DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3'}}
-+
-+DEFAULT_AUTO_FIELD='django.db.models.AutoField'
diff --git a/python-testfixtures.changes b/python-testfixtures.changes
index 547cdd9..4759142 100644
--- a/python-testfixtures.changes
+++ b/python-testfixtures.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Oct  7 15:01:20 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- update to 6.18.3
+  * Fix bug when using :func:`compare` on two regular expressions
+    that have very long patterns.
+  * Fix bug that meant :class:`LogCapture` didn't preserve or
+    provide a clean testing environment for filters.
+  * Fix bug when showing differences between mappings found by
+    :func:`compare` when mismatching values contained the same
+    number more than once.
+  * Add support for lazy resolution of prefix and suffix when using
+    :func:`compare`.
+- Drop appease-django-320.patch merged upstream
+- Drop unresolvable Python 2 build
+
 -------------------------------------------------------------------
 Sun May  9 17:11:41 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-testfixtures.spec b/python-testfixtures.spec
index d3cd4f1..1d617ba 100644
--- a/python-testfixtures.spec
+++ b/python-testfixtures.spec
@@ -16,17 +16,15 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_without python2
+%{?!python_module:%define python_module() python3-%{**}}
+%define skip_python2 1
 Name:           python-testfixtures
-Version:        6.17.1
+Version:        6.18.3
 Release:        0
 Summary:        A collection of helpers and mock objects for unit tests and doc tests
 License:        MIT
 URL:            https://github.com/Simplistix/testfixtures
 Source:         https://files.pythonhosted.org/packages/source/t/testfixtures/testfixtures-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM: gh#Simplistix/testfixtures/commit/52a14d92a122665b1a101e6398eca3982de01739
-Patch0:         appease-django-320.patch
 BuildRequires:  %{python_module Django}
 BuildRequires:  %{python_module Twisted}
 BuildRequires:  %{python_module pytest >= 3.6}
@@ -41,9 +39,6 @@ Suggests:       python-Twisted
 Suggests:       python-sybil
 Suggests:       python-zope.component
 BuildArch:      noarch
-%if %{with python2}
-BuildRequires:  python2-mock
-%endif
 %python_subpackages
 
 %description
@@ -78,6 +73,7 @@ export PYTHONPATH=$(pwd)
 %files %{python_files}
 %license LICENSE.txt
 %doc README.rst docs/*.txt
-%{python_sitelib}/*
+%{python_sitelib}/testfixtures
+%{python_sitelib}/testfixtures-%{version}*-info
 
 %changelog
diff --git a/testfixtures-6.17.1.tar.gz b/testfixtures-6.17.1.tar.gz
deleted file mode 100644
index 7748285..0000000
--- a/testfixtures-6.17.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ec3a0dd6f71cc4c304fbc024a10cc293d3e0b852c868014b9f233203e149bda
-size 121440
diff --git a/testfixtures-6.18.3.tar.gz b/testfixtures-6.18.3.tar.gz
new file mode 100644
index 0000000..761da58
--- /dev/null
+++ b/testfixtures-6.18.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2600100ae96ffd082334b378e355550fef8b4a529a6fa4c34f47130905c7426d
+size 122142