diff --git a/Catch2-2.13.9.tar.gz b/Catch2-2.13.9.tar.gz
deleted file mode 100644
index 036c5c7..0000000
--- a/Catch2-2.13.9.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06dbc7620e3b96c2b69d57bf337028bf245a211b3cddb843835bfe258f427a52
-size 661915
diff --git a/Catch2-3.1.0.tar.gz b/Catch2-3.1.0.tar.gz
new file mode 100644
index 0000000..ba017b6
--- /dev/null
+++ b/Catch2-3.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c252b2d9537e18046d8b82535069d2567f77043f8e644acf9a9fffc22ea6e6f7
+size 1031425
diff --git a/Catch2.changes b/Catch2.changes
index 4c81d4d..daac75c 100644
--- a/Catch2.changes
+++ b/Catch2.changes
@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Sat Sep 24 08:01:35 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to 3.1.0
+  * Added type constraints onto random generator
+  * Added All/Any/NoneTrue range matchers
+  * The JUnit reporter now normalizes classnames from C++ namespaces
+    to Java-like namespaces
+  * The Bazel support now understands BAZEL_TEST environment variable
+  * catch_discover_tests now has a new options for setting library
+    load path(s) when running the Catch2 binary
+  * Fixed crash when listing listeners without any registered listeners
+- Update to 3.0.1
+  * Breaking changes:
+    * Catch2 is now split into multiple headers
+    * C++14 is the minimum required C++ version
+    * CATCH_CONFIG_DISABLE_MATCHERS no longer exists.
+    * CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER no longer exists.
+    * ANON_TEST_CASE has been removed
+    * Multiple commandline flags have changed their behavior
+    * See migration guide
+      https://github.com/catchorg/Catch2/blob/v3.0.1/docs/migrate-v2-to-v3.md#top
+  * Matchers have been extended with the ability to use different
+    signatures of match
+    * templated match member function
+    * Provided generic matchers like IsEmpty, SizeIs, Contains,
+      AllMatch, AnyMatch, NoneMatch
+  * Significant compilation time improvements
+  * Some runtime performance optimizations
+  * Many other changes and bugfixes
+    https://github.com/catchorg/Catch2/releases/tag/v3.0.1
+- Removed upstream merged fix-pragmas-old-gcc.patch
+
 -------------------------------------------------------------------
 Tue Apr 26 12:06:41 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
 
diff --git a/Catch2.spec b/Catch2.spec
index 3bd0ee0..5a1f0d2 100644
--- a/Catch2.spec
+++ b/Catch2.spec
@@ -17,38 +17,36 @@
 
 
 Name:           Catch2
-Version:        2.13.9
+Version:        3.1.0
 Release:        0
 Summary:        A modern, C++-native, header-only, test framework for unit-tests, TDD and BDD
 License:        BSL-1.0
 URL:            https://github.com/catchorg/%{name}/
 Source:         https://github.com/catchorg/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-#PATCH-FIX-OPENSUSE fix-pragmas-old-gcc.patch -- Fix usage of gcc pragmas for old gcc version on Leap gh#catchorg/Catch2#2416
-Patch0:         fix-pragmas-old-gcc.patch
-BuildRequires:  cmake >= 3.5
+BuildRequires:  cmake >= 3.10
 BuildRequires:  gcc-c++ >= 6
 BuildRequires:  pkgconfig
 
 %description
 Catch2 stands for C++ Automated Test Cases in a Header and is a multi-paradigm
-test framework for C++. which also supports Objective-C (and maybe C).
-It is primarily distributed as a single header file, although certain
-extensions may require additional headers.
+test framework for modern C++14 and newer.
+It also provides basic micro-benchmarking features, and simple BDD macros.
 
 %package devel
 Summary:        A modern, C++-native, header-only, test framework for unit-tests, TDD and BDD
 
 %description devel
 Catch2 stands for C++ Automated Test Cases in a Header and is a multi-paradigm
-test framework for C++. which also supports Objective-C (and maybe C).
-It is primarily distributed as a single header file, although certain
-extensions may require additional headers.
+test framework for modern C++14 and newer.
+It also provides basic micro-benchmarking features, and simple BDD macros.
 
 %prep
 %autosetup -p1
 
 %build
+%global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
 %cmake -DCMAKE_BUILD_TYPE=Release \
+       -DBUILD_SHARED_LIBS=OFF \
        -DCMAKE_INSTALL_DOCDIR=%{_defaultdocdir}/%{name} \
        -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig
 %cmake_build
@@ -65,7 +63,9 @@ extensions may require additional headers.
 %doc %{_defaultdocdir}/%{name}
 %{_datadir}/%{name}
 %{_includedir}/catch2
+%{_libdir}/lib%{name}*.a
 %{_libdir}/cmake/%{name}
 %{_libdir}/pkgconfig/catch2.pc
+%{_libdir}/pkgconfig/catch2-with-main.pc
 
 %changelog
diff --git a/fix-pragmas-old-gcc.patch b/fix-pragmas-old-gcc.patch
deleted file mode 100644
index ee20f5e..0000000
--- a/fix-pragmas-old-gcc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur Catch2-2.13.9/projects/SelfTest/UsageTests/Message.tests.cpp new/projects/SelfTest/UsageTests/Message.tests.cpp
---- Catch2-2.13.9/projects/SelfTest/UsageTests/Message.tests.cpp	2022-04-12 22:38:17.000000000 +0200
-+++ new/projects/SelfTest/UsageTests/Message.tests.cpp	2022-04-26 14:20:39.792719016 +0200
-@@ -243,7 +243,7 @@
- 
- // Clang and gcc have different names for this warning, and clang also
- // warns about an unused value
--#if defined(__GNUG__) && !defined(__clang__)
-+#if defined(__GNUG__) && __GNUG__ >= 8 && !defined(__clang__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wcomma-subscript"
- #elif defined(__clang__)
-@@ -262,7 +262,7 @@
-     SUCCEED();
- }
- 
--#ifdef __GNUG__
-+#if defined(__GNUG__) && __GNUG__ >= 8
- #pragma GCC diagnostic pop
- #endif
-