From 9de53b150b379c698ca0a9806dca07c178f337994dc2f8308dc867bcd60fb43b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 1 Jul 2021 19:11:21 +0000 Subject: [PATCH] Accepting request 903460 from home:aloisw:branches:science - Add patch to handle the downstream 4ti2_ executable prefix in wrapper scripts OBS-URL: https://build.opensuse.org/request/show/903460 OBS-URL: https://build.opensuse.org/package/show/science/4ti2?expand=0&rev=20 --- 4ti2-handle-prefix.patch | 33 +++++++++++++++++++++++++++++++++ 4ti2.changes | 5 +++++ 4ti2.spec | 4 +++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 4ti2-handle-prefix.patch diff --git a/4ti2-handle-prefix.patch b/4ti2-handle-prefix.patch new file mode 100644 index 0000000..264cc56 --- /dev/null +++ b/4ti2-handle-prefix.patch @@ -0,0 +1,33 @@ +--- a/src/groebner/script.template.in ++++ b/src/groebner/script.template.in +@@ -21,7 +21,7 @@ + # 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")) + DIR=`dirname "$SCRIPT"` + FUNCTION=`basename "$SCRIPT"` + +--- a/src/zsolve/graver.template ++++ b/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 + +--- a/src/zsolve/hilbert.template ++++ b/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 + diff --git a/4ti2.changes b/4ti2.changes index 606dc0d..1ab5cc7 100644 --- a/4ti2.changes +++ b/4ti2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 1 13:39:30 UTC 2021 - Alois Wohlschlager + +- Add patch to handle the downstream 4ti2_ executable prefix in wrapper scripts + ------------------------------------------------------------------- Sat Aug 24 15:47:19 UTC 2019 - Jan Engelhardt diff --git a/4ti2.spec b/4ti2.spec index ea2d394..f4acb80 100644 --- a/4ti2.spec +++ b/4ti2.spec @@ -1,7 +1,7 @@ # # spec file for package 4ti2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,8 @@ URL: https://4ti2.github.io/ Source: https://github.com/4ti2/4ti2/releases/download/Release_1_6_9/4ti2-1.6.9.tar.gz Patch1: 4ti2-docdir.diff +# PATCH-FIX-OPENSUSE handle our downstream 4ti2_ executable prefix in the wrapper scripts +Patch2: 4ti2-handle-prefix.patch BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: gcc-c++ >= 4.3