Iñaki Úcar 2022-01-17 14:06:49 +01:00 committed by Benjamin A. Beasley
parent c895350089
commit b5f1cd23a8
1 changed files with 8 additions and 2 deletions

View File

@ -2,7 +2,7 @@
Name: octave-%{octpkg}
Version: 1.9.6
Release: 5%{?dist}
Release: 6%{?dist}
Summary: A 3D surface and volumetric mesh generator for MATLAB/Octave
# Main package: GPLv3+
# Meshfix: GPLv2+
@ -28,7 +28,7 @@ Patch1: iso2mesh-1.9.6-recent_Boost_version.patch
ExcludeArch: armv7hl
BuildRequires: make
BuildRequires: cmake CGAL-devel SuperLU-devel blas-static gcc-c++ zlib-devel octave-devel
BuildRequires: cmake CGAL-devel SuperLU-devel gcc-c++ zlib-devel octave-devel
%if 0%{?fedora} >=32
Requires: octave mpfr-devel boost-devel SuperLU octave-jsonlab octave-jnifti octave-zmat
@ -94,6 +94,9 @@ mv img2mesh.fig inst/
sed -e "s|-Wall|%{optflags}|;s|^LIBS = |&$RPM_LD_FLAGS |" \
-i tools/meshfix/contrib/JMeshLib/test/Makefile
# Link FlexiBLAS instead of BLAS
sed -e "s| blas| flexiblas|" -i tools/meshfix/CMakeLists.txt
# Fix tetgen build flags
sed -e "s|^\(CXXFLAGS = \).*|\1%{optflags} $RPM_LD_FLAGS|" \
-e "s|-O0|%{optflags} $RPM_LD_FLAGS|" \
@ -158,6 +161,9 @@ install -m 0755 -vp bin/* %{buildroot}%{_libexecdir}/%{octpkg}/
%doc sample
%changelog
* Fri May 06 2022 Iñaki Úcar <iucar@fedoraproject.org> - 1.9.6-6
- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild