From a4653f3b7de0adc4af16aa7d59c59d15828708f8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 12 Jun 2025 15:31:12 -0600 Subject: [PATCH 1/3] Rebuild for normaliz 3.10.5 --- Macaulay2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Macaulay2.spec b/Macaulay2.spec index 5ea7a8a..08cb251 100644 --- a/Macaulay2.spec +++ b/Macaulay2.spec @@ -48,7 +48,7 @@ Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 Version: 1.25.05 -Release: 1%{?dist} +Release: 2%{?dist} # GPL-2.0-only OR GPL-3.0-only: # - the project as a whole @@ -590,6 +590,9 @@ make check -C BUILD/%{_target_platform}/Macaulay2/bin %changelog +* Wed Jun 11 2025 Jerry James - 1.25.05-2 +- Rebuild for normaliz 3.10.5 + * Thu May 29 2025 Jerry James - 1.25.05-1 - Version 1.25.05 - Drop upstreamed patches: no_gftables, fplll, codim-option, rightarrow From 1f34aa704fc29769cc9a8b105ffc35106d510ef3 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 13 Jun 2025 09:37:49 -0600 Subject: [PATCH 2/3] Unbundle factory-gftables (bz 2372455) --- Macaulay2.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Macaulay2.spec b/Macaulay2.spec index 08cb251..d42e76b 100644 --- a/Macaulay2.spec +++ b/Macaulay2.spec @@ -48,7 +48,7 @@ Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 Version: 1.25.05 -Release: 2%{?dist} +Release: 3%{?dist} # GPL-2.0-only OR GPL-3.0-only: # - the project as a whole @@ -529,6 +529,10 @@ for fil in checkregularity chiro2circuits chiro2cocircuits cohomcalg csdp lrs \ ln -s %{_bindir}/$fil $mbindir/$fil done +# unbundle factory-gftables +rm -fr %{buildroot}%{_datadir}/Macaulay2/Core/factory +ln -s ../../factory %{buildroot}%{_datadir}/Macaulay2/Core + # app img for sz in 64 72 96 128 192 256 512; do sz2=${sz}x${sz} @@ -590,6 +594,9 @@ make check -C BUILD/%{_target_platform}/Macaulay2/bin %changelog +* Fri Jun 13 2025 Jerry James - 1.25.05-3 +- Unbundle factory-gftables (bz 2372455) + * Wed Jun 11 2025 Jerry James - 1.25.05-2 - Rebuild for normaliz 3.10.5 From 08c411562e572f128fb6b4a27a5e1b2f38d038d6 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 8 Aug 2025 13:54:08 -0600 Subject: [PATCH 3/3] Version 1.25.06 --- Macaulay2.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Macaulay2.spec b/Macaulay2.spec index d42e76b..9a8f9fc 100644 --- a/Macaulay2.spec +++ b/Macaulay2.spec @@ -47,8 +47,8 @@ Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 -Version: 1.25.05 -Release: 3%{?dist} +Version: 1.25.06 +Release: 1%{?dist} # GPL-2.0-only OR GPL-3.0-only: # - the project as a whole @@ -594,10 +594,13 @@ make check -C BUILD/%{_target_platform}/Macaulay2/bin %changelog -* Fri Jun 13 2025 Jerry James - 1.25.05-3 +* Fri Aug 08 2025 Jerry James - 1.25.06-1 +- Version 1.25.06 + +* Fri Jun 13 2025 Jerry James - 1.25.05-3 - Unbundle factory-gftables (bz 2372455) -* Wed Jun 11 2025 Jerry James - 1.25.05-2 +* Wed Jun 11 2025 Jerry James - 1.25.05-2 - Rebuild for normaliz 3.10.5 * Thu May 29 2025 Jerry James - 1.25.05-1 diff --git a/sources b/sources index afd777f..d32f616 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (Macaulay2-icons.tar.xz) = 069aa0ad70a0253583b00091c094da9b79d2a2f0f2d38aa97f543081f5df5fd3b5a9e1463febd6947c3151cf01844133174c7372f57e158c2d3faba6baed5d1d -SHA512 (Macaulay2-1.25.05.tar.gz) = 00bc29fb15f01b354f94ff8088f362375e34d3d5c83f8a08365bcbd69156ae3c1fcd3104f788c759a6ad5e06faa24f7f01f9d628b01497fb031ad6e2454765b8 +SHA512 (Macaulay2-1.25.06.tar.gz) = 4493fd9142ea78d3a30f289f7bd03666f646858798b93feb7c8a96669a6ef1a47b30914ba9be34af5b36d1623aba6c8394d795b6688b36ac1b7fbccb96e34fea SHA512 (4ti2-1.6.10.tar.gz) = 0bdf73a8885fe03258a903f0bfb45b8271dcf755d8033b57b8d5620daba7fc25b51031ffb2c8609e40bc19508e07ba028de035d8c193caeffe6400457fc0e3e1 SHA512 (cddlib-094m.tar.gz) = d140d57391b1c963d68ca2e344fbda723a5077004bace322a18362fdc1fff8b50fdc4b598ca8cdf131158e07afc96c5d9aafd7abde082a9e241701e403310b9f SHA512 (cohomCalg-0.32.tar.gz) = b76d8de00b13a8fe8881222178247c5e99c15075c46290830f6c3afffb9dfc18af0d57f738ac5a0d7c00044db81b4465d1e0563c95f7f656a2440be5765c6818