zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build rpm without CGAL for Fedora 32 

- seemds to be missing from the copr system
Mark Olesen
2020-09-04 14:27:01 +02:00
parent c59d31216a
commit ea846b0902
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packaging/common/openfoamVERSION-pv.spec

@ -90,8 +90,9 @@ BuildRequires: zlib-devel
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: fftw3-devel BuildRequires: fftw3-devel
# Note: missing cgal on Fedora32 copr!
%if %{with cgal} %if %{with cgal}
%if 0%{?fedora}%{?suse_version} %if 0%{?fedora}%{?suse_version} && (0%{?fedora_version} != 32)
BuildRequires: cmake(CGAL) BuildRequires: cmake(CGAL)
%endif %endif
%endif %endif
@ -139,7 +140,7 @@ BuildRequires: pkgconfig(Qt5Xml)
Summary: OpenFOAM common files Summary: OpenFOAM common files
Group: Productivity/Scientific/Physics Group: Productivity/Scientific/Physics
BuildArch: noarch BuildArch: noarch
Requires: awk Requires: gawk
Suggests: gnuplot Suggests: gnuplot
%if %{with foam_selector} %if %{with foam_selector}
Requires(post): openfoam-selector Requires(post): openfoam-selector
@ -280,11 +281,12 @@ then
%{__gzip} -c > build/package-tmp/man1/openfoam%{foam_version}.1.gz %{__gzip} -c > build/package-tmp/man1/openfoam%{foam_version}.1.gz
fi fi
# OpenFOAM uses c++11 (gcc >= 4.8.5), but RPM builds will generally have # OpenFOAM uses c++11 (gcc >= 4.8.5), but RPM builds will generally have
# gcc >= 6.1 and can use (c++14), which is needed for the newest CGAL # gcc >= 6.1 and can use (c++14), which is needed for the newest CGAL
# - leap15.1 = gcc 7.5.0 # - leap15.1 = gcc 7.5.0
# - rh8 = gcc 8.3.1 # - rh8 = gcc 8.3.1
%if 0%{?suse_version} || 0%{?rhel} >= 8 || 0%{?fedora} %if 0%{?fedora}%{?suse_version} || (0%{?rhel} >= 8)
gcc_rule="wmake/rules/General/Gcc/c++" gcc_rule="wmake/rules/General/Gcc/c++"
if [ -f "$gcc_rule" ] if [ -f "$gcc_rule" ]
then then

5
packaging/common/openfoamVERSION.spec

@ -87,8 +87,9 @@ BuildRequires: zlib-devel
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: fftw3-devel BuildRequires: fftw3-devel
# Note: missing cgal on Fedora32 copr!
%if %{with cgal} %if %{with cgal}
%if 0%{?fedora}%{?suse_version} %if 0%{?fedora}%{?suse_version} && (0%{?fedora_version} != 32)
BuildRequires: cmake(CGAL) BuildRequires: cmake(CGAL)
%endif %endif
%endif %endif
@ -264,7 +265,7 @@ fi
# gcc >= 6.1 and can use (c++14), which is needed for the newest CGAL # gcc >= 6.1 and can use (c++14), which is needed for the newest CGAL
# - leap15.1 = gcc 7.5.0 # - leap15.1 = gcc 7.5.0
# - rh8 = gcc 8.3.1 # - rh8 = gcc 8.3.1
%if 0%{?suse_version} || 0%{?rhel} >= 8 || 0%{?fedora} %if 0%{?fedora}%{?suse_version} || (0%{?rhel} >= 8)
gcc_rule="wmake/rules/General/Gcc/c++" gcc_rule="wmake/rules/General/Gcc/c++"
if [ -f "$gcc_rule" ] if [ -f "$gcc_rule" ]
then then