[rpms/catch] rawhide: Simplify disablement of reproducible builds

[rpms/catch] rawhide: Simplify disablement of reproducible builds

[Tom Hughes]

A new commit has been pushed.

Repo   : rpms/catch
Branch : rawhide
Commit : 9e625639938fc846aac23c750cbfb10524c5d52e
Author : Tom Hughes <tom@compton.nu>
Date   : 2026-09-02T22:03:24+01:00
Stats  : +1/-30 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/catch/c/9e625639938fc846aac23c750cbfb10524c5d52e?branch=rawhide

Log:
Simplify disablement of reproducible builds

---
diff --git a/catch.spec b/catch.spec
index 2424f9f..3f94dd0 100644
--- a/catch.spec
+++ b/catch.spec
@@ -6,8 +6,6 @@ Summary:        Modern, C++-native, header-only, framework for unit-tests, TDD a
 License:        BSL-1.0
 URL:            https://github.com/catchorg/Catch2
 Source:         https://github.com/catchorg/Catch2/archive/v%{version}/Catch2-%{version}.tar.gz
-# https://github.com/catchorg/Catch2/issues/3198
-Patch:          file-prefix-map.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -39,6 +37,7 @@ developing applications that use %{name}.
 %conf
 %cmake \
     -DCMAKE_BUILD_TYPE=Release \
+    -DCATCH_ENABLE_REPRODUCIBLE_BUILD=OFF \
     -DCATCH_BUILD_EXTRA_TESTS=ON \
     -DCATCH_ENABLE_WERROR=OFF \
     -DCATCH_INSTALL_DOCS=OFF \

diff --git a/file-prefix-map.patch b/file-prefix-map.patch
deleted file mode 100644
index 2524556..0000000
--- a/file-prefix-map.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From afa021f7820f03a15c0f39da197129addbd5b93d Mon Sep 17 00:00:00 2001
-From: Tom Hughes <tom@compton.nu>
-Date: Wed, 2 Sep 2026 18:36:36 +0100
-Subject: [PATCH] Drop use of -ffile-prefix-map
-
-https://github.com/catchorg/Catch2/issues/3198
----
- CMake/CatchMiscFunctions.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMake/CatchMiscFunctions.cmake b/CMake/CatchMiscFunctions.cmake
-index d1cf5fc2..47f6f4bf 100644
---- a/CMake/CatchMiscFunctions.cmake
-+++ b/CMake/CatchMiscFunctions.cmake
-@@ -115,7 +115,7 @@ endfunction()
- # Currently only supports GCC and Clang
- function(add_build_reproducibility_settings target)
-   # Make the build reproducible on versions of g++ and clang that supports -ffile-prefix-map
--  if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
--    add_cxx_flag_if_supported_to_targets("-ffile-prefix-map=${CATCH_DIR}/=" "${target}")
--  endif()
-+  #if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-+  #  add_cxx_flag_if_supported_to_targets("-ffile-prefix-map=${CATCH_DIR}/=" "${target}")
-+  #endif()
- endfunction()
--- 
-2.55.0
-