SHA256
1
0
forked from pool/4ti2

4ti2 1.6.12

This commit is contained in:
2025-05-29 00:13:47 +02:00
parent 51ff554411
commit 92c051e918
5 changed files with 27 additions and 53 deletions

BIN
4ti2-1.6.11.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
4ti2-1.6.12.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -1,32 +1,25 @@
From 0d4518dbcf9321df4d8cad6e97e562f34f7d31f4 Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Thu, 1 Jul 2021 14:37:06 +0000
Subject: [PATCH] scripts: apply realpath for $0
References: https://github.com/4ti2/4ti2/pull/31
From: Jan Engelhardt <jengelh@inai.de>
Date: 2025-01-24 22:01:47+0100
Upstream: no (4ti2_ script prefix is openSUSE-specific)
When $0 is a symlink, program execution would fail to find the right
directory. Fix that up.
realpath is needed to get the final directory (/usr/libexec/4ti2 in openSUSE),
but in doing so, we also get the final script name (zsolve), which is
undesired. FUNCTION needs to be derived from the initial unresolved $0 value.
The 4ti2 program names are quite generic (e.g. "output"), and hence
openSUSE has relegated them to /usr/libexec/4ti2, offering instead
prefixed symlinks in /usr/bin, e.g. /usr/bin/4ti2_groebner ->
/usr/libexec/4ti2/groebner.
---
src/groebner/script.template | 5 +++--
src/groebner/script.template.in | 5 +++--
src/zsolve/graver.template | 2 +-
src/zsolve/hilbert.template | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
2 files changed, 6 insertions(+), 4 deletions(-)
Index: 4ti2-1.6.10/src/groebner/script.template
Index: 4ti2-1.6.12/src/groebner/script.template
===================================================================
--- 4ti2-1.6.10.orig/src/groebner/script.template
+++ 4ti2-1.6.10/src/groebner/script.template
--- 4ti2-1.6.12.orig/src/groebner/script.template
+++ 4ti2-1.6.12/src/groebner/script.template
@@ -21,9 +21,10 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# We locate where this script is so we can call the executables.
-SCRIPT=`which "$0"`
-SCRIPT=$(realpath $(which "$0"))
+FUNCTION="${0##*/}"
+FUNCTION="${FUNCTION#4ti2_}"
+SCRIPT=$(realpath "$(which "$0")")
@@ -35,15 +28,15 @@ Index: 4ti2-1.6.10/src/groebner/script.template
# The default executable.
EXECUTABLE=4ti2int64
Index: 4ti2-1.6.10/src/groebner/script.template.in
Index: 4ti2-1.6.12/src/groebner/script.template.in
===================================================================
--- 4ti2-1.6.10.orig/src/groebner/script.template.in
+++ 4ti2-1.6.10/src/groebner/script.template.in
--- 4ti2-1.6.12.orig/src/groebner/script.template.in
+++ 4ti2-1.6.12/src/groebner/script.template.in
@@ -21,9 +21,10 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# We locate where this script is so we can call the executables.
-SCRIPT=`which "$0"`
-SCRIPT=$(realpath $(which "$0"))
+FUNCTION="${0##*/}"
+FUNCTION="${FUNCTION#4ti2_}"
+SCRIPT=$(realpath "$(which "$0")")
@@ -52,29 +45,3 @@ Index: 4ti2-1.6.10/src/groebner/script.template.in
# The default executable.
EXECUTABLE=@GROEBNER_DEFAULT_EXECUTABLE@
Index: 4ti2-1.6.10/src/zsolve/graver.template
===================================================================
--- 4ti2-1.6.10.orig/src/zsolve/graver.template
+++ 4ti2-1.6.10/src/zsolve/graver.template
@@ -2,7 +2,7 @@
# We locate where this script is so we can call the executable zsolve which
# should be in the same directory as this script.
-SCRIPT=`which "$0"`
+SCRIPT=$(realpath $(which "$0"))
SCRIPTDIR=`dirname "$SCRIPT"`
EXECUTABLE=zsolve
Index: 4ti2-1.6.10/src/zsolve/hilbert.template
===================================================================
--- 4ti2-1.6.10.orig/src/zsolve/hilbert.template
+++ 4ti2-1.6.10/src/zsolve/hilbert.template
@@ -2,7 +2,7 @@
# We locate where this script is so we can call the executable zsolve which
# should be in the same directory as this script.
-SCRIPT=`which "$0"`
+SCRIPT=$(realpath $(which "$0"))
SCRIPTDIR=`dirname "$SCRIPT"`
EXECUTABLE=zsolve

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed May 28 22:06:01 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Update to release 1.6.12
* Remove Allegro Common Lisp interface (not built in openSUSE
anyway); current SWIG no longer supports it.
-------------------------------------------------------------------
Sat May 3 00:26:46 UTC 2025 - Jan Engelhardt <jengelh@inai.de>

View File

@@ -17,13 +17,13 @@
Name: 4ti2
Version: 1.6.11
Version: 1.6.12
Release: 0
Summary: Package for algebraic, geometric and combinatorial problems on linear spaces
License: GPL-2.0-or-later
Group: Productivity/Scientific/Math
URL: https://4ti2.github.io/
Source: https://github.com/4ti2/4ti2/releases/download/Release_1_6_11/4ti2-%version.tar.gz
Source: https://github.com/4ti2/4ti2/releases/download/Release_1_6_12/4ti2-%version.tar.gz
Patch2: 4ti2-handle-prefix.patch
BuildRequires: fdupes
BuildRequires: gcc-c++ >= 4.3