This commit is contained in:
parent
4ca3b28cd2
commit
d88cdd0e77
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
Name: octave-%{octpkg}
|
Name: octave-%{octpkg}
|
||||||
Version: 1.9.6
|
Version: 1.9.6
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: A 3D surface and volumetric mesh generator for MATLAB/Octave
|
Summary: A 3D surface and volumetric mesh generator for MATLAB/Octave
|
||||||
# Main package: GPLv3+
|
# Main package: GPLv3+
|
||||||
# Meshfix: GPLv2+
|
# Meshfix: GPLv2+
|
||||||
|
@ -28,7 +28,7 @@ Patch1: iso2mesh-1.9.6-recent_Boost_version.patch
|
||||||
|
|
||||||
ExcludeArch: armv7hl
|
ExcludeArch: armv7hl
|
||||||
BuildRequires: make
|
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
|
%if 0%{?fedora} >=32
|
||||||
Requires: octave mpfr-devel boost-devel SuperLU octave-jsonlab octave-jnifti octave-zmat
|
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 |" \
|
sed -e "s|-Wall|%{optflags}|;s|^LIBS = |&$RPM_LD_FLAGS |" \
|
||||||
-i tools/meshfix/contrib/JMeshLib/test/Makefile
|
-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
|
# Fix tetgen build flags
|
||||||
sed -e "s|^\(CXXFLAGS = \).*|\1%{optflags} $RPM_LD_FLAGS|" \
|
sed -e "s|^\(CXXFLAGS = \).*|\1%{optflags} $RPM_LD_FLAGS|" \
|
||||||
-e "s|-O0|%{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
|
%doc sample
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 06 2022 Iñaki Úcar <iucar@fedoraproject.org> - 1.9.6-4
|
||||||
|
- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
|
||||||
|
|
||||||
* Thu Jul 22 2021 Qianqian Fang <fangqq@gmail.com> - 1.9.6-3
|
* Thu Jul 22 2021 Qianqian Fang <fangqq@gmail.com> - 1.9.6-3
|
||||||
- Apply makefile patch by Laurent Rineau, fix CGAL build error on F35, fix #1917433
|
- Apply makefile patch by Laurent Rineau, fix CGAL build error on F35, fix #1917433
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue