From 4d10bff2f36e698d72ec8ef24d6bb5208fb5b608 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mar 21 2024 16:15:13 +0000 Subject: Stop building for 32-bit x86 - Drop maxnorm patch which was only needed for i386 --- diff --git a/4ti2-maxnorm.patch b/4ti2-maxnorm.patch deleted file mode 100644 index 8042b6f..0000000 --- a/4ti2-maxnorm.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- src/zsolve/Options.cpp.orig 2018-08-19 09:37:54.000000000 -0600 -+++ src/zsolve/Options.cpp 2018-10-09 15:22:30.464345255 -0600 -@@ -70,7 +70,7 @@ Options::set_defaults () - m_loglevel = 0; - m_backup_frequency = 0; - m_resume = false; -- m_maxnorm = false; -+ m_maxnorm = 0; - } - - void -@@ -195,7 +195,7 @@ Options::process_options (int argc, char - m_graver = true; - break; - case 'm': -- m_maxnorm = true; -+ m_maxnorm = 1; - break; - case 'p': - if (optarg == NULL || !strcmp (optarg, "32")) -@@ -381,7 +381,7 @@ bool Options::graver () const - return m_graver; - } - --bool Options::maxnorm () const -+int Options::maxnorm () const - { - return m_maxnorm; - } ---- src/zsolve/Options.h.orig 2018-08-19 09:37:54.000000000 -0600 -+++ src/zsolve/Options.h 2018-10-09 15:20:13.673783047 -0600 -@@ -39,7 +39,7 @@ protected: - bool m_resume; - bool m_hilbert; - bool m_graver; -- bool m_maxnorm; -+ int m_maxnorm; - _4ti2_precision m_precision; - - public: -@@ -63,7 +63,7 @@ public: - bool resume () const; - bool hilbert () const; - bool graver () const; -- bool maxnorm () const; -+ int maxnorm () const; - _4ti2_precision precision () const; - - friend std::istream& operator>>(std::istream& in, Options& options); diff --git a/4ti2.spec b/4ti2.spec index ec4c539..a502586 100644 --- a/4ti2.spec +++ b/4ti2.spec @@ -12,10 +12,12 @@ Summary: Algebraic, geometric and combinatorial problems on linear spaces # CM-Super: GPL-1.0-or-later License: GPL-2.0-or-later AND OFL-1.1-RFN AND Knuth-CTAN AND GPL-1.0-or-later URL: https://4ti2.github.io/ -Source0: https://github.com/4ti2/4ti2/releases/download/Release_%{relver}/%{name}-%{version}.tar.gz +VCS: https://github.com/4ti2/4ti2 +Source0: %{vcs}/releases/download/Release_%{relver}/%{name}-%{version}.tar.gz Source1: 4ti2.module.in -# Deal with a boolean variable that can somehow hold the value 2 -Patch0: %{name}-maxnorm.patch + +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} BuildRequires: environment(modules) BuildRequires: gcc @@ -56,7 +58,7 @@ A library for algebraic, geometric and combinatorial problems on linear spaces. %prep -%autosetup -p0 +%autosetup # Add a missing executable bit chmod a+x ltmain.sh