6 Commits

Author SHA256 Message Date
c430d7dc98 4ti2 1.6.14 2025-11-26 09:49:56 +01:00
194d566aa2 4ti2 1.6.13 2025-07-20 15:21:23 +02:00
92c051e918 4ti2 1.6.12 2025-05-29 00:27:54 +02:00
51ff554411 4ti2 1.6.11 2025-05-03 02:27:05 +02:00
d8ce10437a Drop bashisms from build recipe 2025-02-24 15:48:38 +01:00
d910ab2447 Rewrite pathing in 4ti2-handle-prefix.patch
References: https://bugzilla.opensuse.org/1233672
2025-01-24 22:05:27 +01:00
5 changed files with 82 additions and 72 deletions

Binary file not shown.

BIN
4ti2-1.6.14.tar.gz LFS Normal file

Binary file not shown.

View File

@@ -1,72 +1,47 @@
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 | 2 +-
src/groebner/script.template.in | 2 +-
src/zsolve/graver.template | 2 +-
src/zsolve/hilbert.template | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
src/groebner/script.template | 5 +++--
src/groebner/script.template.in | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
Index: 4ti2-1.6.9/src/groebner/script.template
Index: 4ti2-1.6.12/src/groebner/script.template
===================================================================
--- 4ti2-1.6.9.orig/src/groebner/script.template
+++ 4ti2-1.6.9/src/groebner/script.template
@@ -21,7 +21,7 @@
--- 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"))
-SCRIPT=$(realpath $(which "$0"))
+FUNCTION="${0##*/}"
+FUNCTION="${FUNCTION#4ti2_}"
+SCRIPT=$(realpath "$(which "$0")")
DIR=`dirname "$SCRIPT"`
FUNCTION=`basename "$SCRIPT"`
-FUNCTION=`basename "$SCRIPT"`
Index: 4ti2-1.6.9/src/groebner/script.template.in
# The default executable.
EXECUTABLE=4ti2int64
Index: 4ti2-1.6.12/src/groebner/script.template.in
===================================================================
--- 4ti2-1.6.9.orig/src/groebner/script.template.in
+++ 4ti2-1.6.9/src/groebner/script.template.in
@@ -21,7 +21,7 @@
--- 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"))
-SCRIPT=$(realpath $(which "$0"))
+FUNCTION="${0##*/}"
+FUNCTION="${FUNCTION#4ti2_}"
+SCRIPT=$(realpath "$(which "$0")")
DIR=`dirname "$SCRIPT"`
FUNCTION=`basename "$SCRIPT"`
Index: 4ti2-1.6.9/src/zsolve/graver.template
===================================================================
--- 4ti2-1.6.9.orig/src/zsolve/graver.template
+++ 4ti2-1.6.9/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.9/src/zsolve/hilbert.template
===================================================================
--- 4ti2-1.6.9.orig/src/zsolve/hilbert.template
+++ 4ti2-1.6.9/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
-FUNCTION=`basename "$SCRIPT"`
# The default executable.
EXECUTABLE=@GROEBNER_DEFAULT_EXECUTABLE@

View File

@@ -1,3 +1,41 @@
-------------------------------------------------------------------
Wed Nov 26 08:45:30 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Update to release 1.6.14
* Fix timer-related code for mingw64
-------------------------------------------------------------------
Sun Jul 20 13:05:39 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Update to release 1.6.13
* zsolve: remove secret 'maxnorm == 2' option handling
-------------------------------------------------------------------
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>
- Update to release 1.6.11
* Build system changes only
-------------------------------------------------------------------
Mon Feb 24 14:48:18 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Trim bashisms from build recipe
-------------------------------------------------------------------
Fri Jan 24 21:01:47 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Edit 4ti2-handle-prefix.diff [boo#1233672]
* Avoid eagerly following %fdupes-created symlinks when
determining what final program to call.
* Handle being called as /usr/bin/4ti2_circuits.
-------------------------------------------------------------------
Wed Apr 26 08:33:12 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

View File

@@ -1,7 +1,7 @@
#
# spec file for package 4ti2
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,19 +17,18 @@
Name: 4ti2
Version: 1.6.10
Version: 1.6.14
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_10/4ti2-1.6.10.tar.gz
Source: https://github.com/4ti2/4ti2/releases/download/Release_1_6_14/4ti2-1.6.14.tar.gz
Patch2: 4ti2-handle-prefix.patch
BuildRequires: fdupes
BuildRequires: gcc-c++ >= 4.3
BuildRequires: glpk-devel >= 4.52
BuildRequires: gmp-devel >= 4.1.4
BuildRequires: pkgconfig(glpk) >= 4.52
%description
4ti2 is a collection of programs that compute and solve algebraic,
@@ -42,9 +41,9 @@ Group: System/Libraries
%description -n lib4ti2-0
This package contains the 4ti2 program library, which comes in three
flavors:
- 32-bit precision integers
- 64-bit precision integers
- arbitrary precision integer support through use of GNU MP
* 32-bit precision integers
* 64-bit precision integers
* arbitrary precision integer support through use of GNU MP
%package -n libzsolve0
Summary: Library for solving linear systems over integers for 4ti2
@@ -78,16 +77,14 @@ b="%buildroot"
rm -f "$b/%_libdir"/*.la
mkdir -p "$b/%_bindir" "$b/%_libexecdir/%name"
mv "$b/%_bindir"/* "$b/%_libexecdir/%name/"
pushd "$b/%_libexecdir/%name"
cd "$b/%_libexecdir/%name"
for i in *; do
ln -s "%_libexecdir/%name/$i" "$b/%_bindir/4ti2_$i"
done
%fdupes -s %buildroot/%_prefix
%post -n lib4ti2-0 -p /sbin/ldconfig
%postun -n lib4ti2-0 -p /sbin/ldconfig
%post -n libzsolve0 -p /sbin/ldconfig
%postun -n libzsolve0 -p /sbin/ldconfig
%ldconfig_scriptlets -n lib4ti2-0
%ldconfig_scriptlets -n libzsolve0
%files
%license COPYING