diff --git a/memtailor-gtest.patch b/memtailor-gtest.patch index c16fea6..da40318 100644 --- a/memtailor-gtest.patch +++ b/memtailor-gtest.patch @@ -1,6 +1,6 @@ ---- configure.ac.orig 2020-05-26 17:38:06.000000000 -0600 -+++ configure.ac 2020-07-01 20:02:22.195324025 -0600 -@@ -52,7 +52,7 @@ AS_IF([test "x$with_gtest" == "xdownload +--- configure.ac.orig 2023-09-16 02:06:33.000000000 -0600 ++++ configure.ac 2023-10-16 08:04:57.251773143 -0600 +@@ -53,7 +53,7 @@ AS_IF([test "x$with_gtest" == "xdownload fi ])], [test "x$with_gtest" == "xyes"], [ @@ -9,7 +9,7 @@ AC_MSG_ERROR([could not find gtest source at path $GTEST_PATH.]) ]) ], -@@ -60,7 +60,8 @@ AS_IF([test "x$with_gtest" == "xdownload +@@ -61,7 +61,8 @@ AS_IF([test "x$with_gtest" == "xdownload [AC_MSG_ERROR([invalid value $with_gtest for with_gtest.])] ) AS_IF([test "x$with_gtest" == "xyes"], @@ -19,19 +19,19 @@ AM_CONDITIONAL(with_gtest, test "x$with_gtest" == "xyes") DEPS_CFLAGS="$GTEST_CFLAGS" ---- Makefile.am.orig 2020-05-26 17:38:06.000000000 -0600 -+++ Makefile.am 2020-07-01 20:01:29.430329069 -0600 +--- Makefile.am.orig 2023-10-16 08:04:57.251773143 -0600 ++++ Makefile.am 2023-10-16 08:07:50.694649630 -0600 @@ -41,7 +41,7 @@ TESTS=unittest check_PROGRAMS=$(TESTS) - unittest_CXXFLAGS = -I$(top_srcdir)/src/ -std=gnu++0x + unittest_CXXFLAGS = -I$(top_srcdir)/src/ -std=gnu++17 -unittest_LDADD = $(top_builddir)/libmemtailor.la -lpthread +unittest_LDADD = $(top_builddir)/libmemtailor.la -lgtest -lpthread # test_LIBS= unittest_SOURCES=src/test/ArenaTest.cpp src/test/BufferPoolTest.cpp \ ---- src/test/gtestInclude.cpp.orig 2020-05-26 17:38:06.000000000 -0600 -+++ src/test/gtestInclude.cpp 2020-07-01 20:01:29.430329069 -0600 +--- src/test/gtestInclude.cpp.orig 2023-09-16 02:06:33.000000000 -0600 ++++ src/test/gtestInclude.cpp 2023-10-16 08:04:57.251773143 -0600 @@ -5,4 +5,4 @@ // the compiler flags are the same, which is the whole point of the // recommendation to build gtest for each program. diff --git a/memtailor.spec b/memtailor.spec index 70e9f9c..77e6b2d 100644 --- a/memtailor.spec +++ b/memtailor.spec @@ -1,12 +1,12 @@ # There have been no releases, so we use a git snapshot -%global gitdate 20220104 -%global gittag 95dbac776c475f4b1c2b08a8e8c6def14c8aaf9a +%global gitdate 20230916 +%global gittag f785005b92a54463dbd5377ab80855a3d2a5f92d %global shorttag %(cut -b -7 <<< %{gittag}) %global user Macaulay2 Name: memtailor Version: 1.0 -Release: 23.%{gitdate}.git%{shorttag}%{?dist} +Release: 24.%{gitdate}.git%{shorttag}%{?dist} Summary: C++ library of special-purpose memory allocators License: BSD-3-Clause @@ -59,10 +59,6 @@ chmod a-x src/test/*.cpp # Fix the URL in the pkgconfig file sed -i 's/broune/Macaulay2/' build/autotools/memtailor.pc.in -# With gtest 1.13.0, C++14 or later is required. Since CMakeLists.txt already -# asks for C++17, we might as well match that. -sed -r -i 's/(-std=gnu\+\+)(0x|11)\b/\117/' Makefile.am - %build # Upstream doesn't generate the configure script, and we have altered # Makefile.am anyway. @@ -102,6 +98,10 @@ LD_LIBRARY_PATH=$PWD/.libs make check %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Oct 26 2023 Jerry James - 1.0-24.20230916.gitf785005 +- Update to latest upstream snapshot +- Upstream now requires C++17 + * Thu Jul 20 2023 Fedora Release Engineering - 1.0-23.20220104.git95dbac7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 68e6a3c..8fd0e0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Macaulay2-memtailor-95dbac7.tar.gz) = 50eded674dc33d3c55f5ec0f250586106f7e16995baa4e46f21684016066cb41e02ace7d82b38305029b947f474835598a972c39dcb0ead6679566b53549a0df +SHA512 (Macaulay2-memtailor-f785005.tar.gz) = 147ef22f322a82d5336c004ba9cce055ee94eb7ad93d4271524cbee4713f94b258342f4e31569abac2e29472fdd25df2fad94000496ce46e469b7e074af3c86e