diff --git a/.files b/.files index f3f208f..c1a0d02 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index ac66a8b..6148ff1 100644 --- a/.rev +++ b/.rev @@ -7,4 +7,12 @@ Add new package fixmath, needed by Libreoffice 7.4 1001660 + + 7e0cebe8caad517d12d4b808f35d141a + 2022.07.20 + + dimstar_suse + + 1004673 + diff --git a/fixmath.changes b/fixmath.changes index b6f4f76..5745ab9 100644 --- a/fixmath.changes +++ b/fixmath.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 15 10:09:53 UTC 2022 - Danilo Spinella + +- Fix build on SLE-12-SP5 + +------------------------------------------------------------------- Wed Jul 20 13:42:45 UTC 2022 - Danilo Spinella - Initial packaging of version 2022.07.20 diff --git a/fixmath.spec b/fixmath.spec index 81a4e52..865d40e 100644 --- a/fixmath.spec +++ b/fixmath.spec @@ -1,7 +1,7 @@ # # spec file for package fixmath # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,14 +24,13 @@ Summary: Fixed point math operations library License: MIT URL: https://github.com/PetteriAimonen/libfixmath Source0: %{url}/archive/refs/heads/master.tar.gz#:/%{name}-%{version}.tar.gz +BuildRequires: gcc-c++ # Use cmake3 package on SLE12 because cmake is too old (version 3.5) %if !0%{?is_opensuse} && 0%{?sle_version} < 150000 -BuildRequires: cmake3-full >= 3.14 +BuildRequires: cmake3-full >= 3.13 # Requires C++17 -BuildRequires: gcc11-c++ %else -BuildRequires: cmake >= 3.14 -BuildRequires: gcc-c++ +BuildRequires: cmake >= 3.13 %endif %description @@ -50,14 +49,14 @@ This package contains the headers and the static library. %autosetup -n lib%{name}-master %build +# Fix lto-no-text-in-archive rpmlint error export CFLAGS="${CFLAGS} -ffat-lto-objects" export CXXFLAGS="${CXXFLAGS} -ffat-lto-objects" -# Use g++-11 to build a C++17 codebase -%cmake \ %if !0%{?is_opensuse} && 0%{?sle_version} < 150000 - -DCMAKE_CXX_COMPILER=/usr/bin/g++-11 \ +# Remove -fsanitize=undefined opts in SLE-12-SP5 +sed -e '/set(sanitizer_opts/d' -i tests/tests.cmake %endif - ; +%cmake %cmake_build %install