SOURCES/run-tests-in-deterministic-order.patch

@@ -1,43 +0,0 @@
-From 64eaa35c2de99581e522608e841defffb4b2923b Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Thu, 21 Oct 2021 11:14:34 +0200
-Subject: [PATCH] Run tests in deterministic order
-
-LibreOffice already benefits from this (see
-<https://git.libreoffice.org/core/+/2f2246d22e2a8ccbc1dc3e6f5243734a61edf270%5E!>
-"external/cppunit: Run tests in deterministic order", especially as otherwise
-the order in which tests happened to get run differed between --disable-lto and
---enable-lto builds.
-
-Change-Id: I87d6d7cb0f4c2f6a0ea1ac3ba3d48b4e089eb5c7
-Reviewed-on: https://gerrit.libreoffice.org/c/cppunit/+/123963
-Tested-by: Stephan Bergmann <sbergman@redhat.com>
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
----
-
-diff --git a/src/cppunit/TestFactoryRegistry.cpp b/src/cppunit/TestFactoryRegistry.cpp
-index 35448a6..3b68d58 100644
---- a/src/cppunit/TestFactoryRegistry.cpp
-+++ b/src/cppunit/TestFactoryRegistry.cpp
-@@ -143,12 +143,20 @@
- void 
- TestFactoryRegistry::addTestToSuite( TestSuite *suite )
- {
-+  std::multimap<std::string, Test *> sorted;
-   for ( Factories::iterator it = m_factories.begin(); 
-         it != m_factories.end(); 
-         ++it )
-   {
-     TestFactory *factory = *it;
--    suite->addTest( factory->makeTest() );
-+    Test *test = factory->makeTest();
-+    sorted.insert({test->getName(), test});
-+  }
-+  // In the unlikely case of multiple Tests with identical names, those will
-+  // still be added in random order:
-+  for (auto const &i: sorted)
-+  {
-+    suite->addTest( i.second );
-   }
- }
- 

SPECS/cppunit.spec

@@ -1,29 +1,15 @@
-## START: Set by rpmautospec
-## (rpmautospec version 0.6.5)
-## RPMAUTOSPEC: autorelease, autochangelog
-%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 23;
-    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
-    print(release_number + base_release_number - 1);
-}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
-## END: Set by rpmautospec
-
 %global apiversion 1.15
 
 Name: cppunit
 Version: 1.15.1
-Release: %autorelease
+Release: 8%{?dist}
 
 Summary: C++ unit testing framework
 # no license in files
-License: LGPL-2.1-or-later
+License: LGPLv2+
 Url: https://www.freedesktop.org/wiki/Software/cppunit/
 Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz
 
-# Backport patch to run tests in deterministic order
-# https://gerrit.libreoffice.org/c/cppunit/+/123963
-Patch: run-tests-in-deterministic-order.patch
-
 BuildRequires: doxygen
 BuildRequires: gcc-c++
 BuildRequires: graphviz
@@ -53,7 +39,7 @@ the popular doxygen documentation generation tool.
 %autosetup -p1
 
 %build
-%configure --enable-doxygen --disable-static --disable-silent-rules --disable-werror
+%configure --enable-doxygen --disable-static --disable-silent-rules
 sed -i \
     -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
     -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
@@ -98,48 +84,15 @@ mv __dist-examples __dist-examples-dir/examples
 %doc doc/html
 
 %changelog
-## START: Generated by rpmautospec
+* Wed Jan 26 2022 Caolán McNamara <caolanm@redhat.com> - 1.15.1-8
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.15.1-23
+- Resolves: rhbz#2040997 skip cppunit-devel
-- Bump release for October 2024 mass rebuild:
-
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.15.1-22
-- Rebuilt for MSVSphere 10
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.15.1-22
-- Bump release for June 2024 mass rebuild
-
-* Fri May 03 2024 Petr Písař <ppisar@redhat.com> - 1.15.1-21
-- tests: Remove unused remnants of Beaker
-
-* Fri May 03 2024 Petr Písař <ppisar@redhat.com> - 1.15.1-20
-- tests: Fix TMT dependencies
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-18
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.15.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Thu Aug 24 2023 Mattia Verga <mattia.verga@proton.me> - 1.15.1-17
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.15.1-6
-- Backport patch to run tests in deterministic order
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Dec 09 2022 Edjunior Machado <emachado@redhat.com> - 1.15.1-14
-- tests: Fix fmf plan deprecated attributes
-
-* Mon Nov 21 2022 David Tardon <dtardon@redhat.com> - 1.15.1-8
-- Convert license to SPDX
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -278,5 +231,3 @@ mv __dist-examples __dist-examples-dir/examples
  
 * Sat Apr 14 2001 Bastiaan Bakker <bastiaan.bakker@lifeline.nl>
 - Initial release
-
-## END: Generated by rpmautospec