From e0af385fa0ddf49d3792e49cc5b37f5274497c07 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 27 Oct 2020 17:37:50 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/glm.git#f3cc3433d1404d522df64e784a3cb14b0dd75bba --- glm.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/glm.spec b/glm.spec index 0968b7d..0492898 100644 --- a/glm.spec +++ b/glm.spec @@ -3,7 +3,7 @@ Name: glm Version: 0.9.9.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ mathematics library for graphics programming License: MIT @@ -86,13 +86,11 @@ sed -i 's/\r//' test/core/core_setup_message.cpp %patch1 -p1 %build -mkdir build -cd build -%{cmake} -DGLM_TEST_ENABLE=ON .. -make %{?_smp_mflags} +%{cmake} -DGLM_TEST_ENABLE=ON +%cmake_build %check -cd build +cd %{_vpath_builddir} # Some tests are disabled due to failing tests (to be reported) # - test-core_func_common fails on aarch64 @@ -100,7 +98,7 @@ cd build ctest --output-on-failure -E '(test-core_func_common|test-gtc_packing)' %install -cd build +cd %{_vpath_builddir} make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' @@ -128,6 +126,9 @@ rmdir $RPM_BUILD_ROOT%{_libdir} %doc doc/api/ %changelog +* Mon Oct 26 2020 Joonas Sarajärvi - 0.9.9.6-6 +- Fix #1863634 - FTBFS in Fedora rawhide/f33 + * Sat Aug 01 2020 Fedora Release Engineering - 0.9.9.6-5 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild