From ea846b09021bdec1a028a5445163d447ea8119e7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 4 Sep 2020 14:27:01 +0200
Subject: [PATCH] build rpm without CGAL for Fedora 32

- seemds to be missing from the copr system
---
 packaging/common/openfoamVERSION-pv.spec | 8 +++++---
 packaging/common/openfoamVERSION.spec    | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packaging/common/openfoamVERSION-pv.spec b/packaging/common/openfoamVERSION-pv.spec
index 9dfe992..cc1f77e 100644
--- a/packaging/common/openfoamVERSION-pv.spec
+++ b/packaging/common/openfoamVERSION-pv.spec
@@ -90,8 +90,9 @@ BuildRequires:  zlib-devel
 BuildRequires:  readline-devel
 BuildRequires:  boost-devel
 BuildRequires:  fftw3-devel
+# Note: missing cgal on Fedora32 copr!
 %if %{with cgal}
-%if 0%{?fedora}%{?suse_version}
+%if 0%{?fedora}%{?suse_version} && (0%{?fedora_version} != 32)
 BuildRequires:  cmake(CGAL)
 %endif
 %endif
@@ -139,7 +140,7 @@ BuildRequires:  pkgconfig(Qt5Xml)
 Summary:        OpenFOAM common files
 Group:          Productivity/Scientific/Physics
 BuildArch:      noarch
-Requires:       awk
+Requires:       gawk
 Suggests:       gnuplot
 %if %{with foam_selector}
 Requires(post):  openfoam-selector
@@ -280,11 +281,12 @@ then
         %{__gzip} -c > build/package-tmp/man1/openfoam%{foam_version}.1.gz
 fi
 
+
 # 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
 # - leap15.1 = gcc 7.5.0
 # - 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++"
 if [ -f "$gcc_rule" ]
 then
diff --git a/packaging/common/openfoamVERSION.spec b/packaging/common/openfoamVERSION.spec
index ee615a6..bb59337 100644
--- a/packaging/common/openfoamVERSION.spec
+++ b/packaging/common/openfoamVERSION.spec
@@ -87,8 +87,9 @@ BuildRequires:  zlib-devel
 BuildRequires:  readline-devel
 BuildRequires:  boost-devel
 BuildRequires:  fftw3-devel
+# Note: missing cgal on Fedora32 copr!
 %if %{with cgal}
-%if 0%{?fedora}%{?suse_version}
+%if 0%{?fedora}%{?suse_version} && (0%{?fedora_version} != 32)
 BuildRequires:  cmake(CGAL)
 %endif
 %endif
@@ -264,7 +265,7 @@ fi
 # gcc >= 6.1 and can use (c++14), which is needed for the newest CGAL
 # - leap15.1 = gcc 7.5.0
 # - 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++"
 if [ -f "$gcc_rule" ]
 then