From 92ad9dfa53ff4daa5d7243073e8f4a82b3fe482a Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Fri, 17 Jul 2020 14:09:27 -0500 Subject: [PATCH] Minor conditional fixes for ELN Signed-off-by: Merlin Mathesius --- metis.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/metis.spec b/metis.spec index 0b4a9df..6fbf73f 100644 --- a/metis.spec +++ b/metis.spec @@ -8,7 +8,7 @@ Name: metis Version: 5.1.0 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Serial Graph Partitioning and Fill-reducing Matrix Ordering License: ASL 2.0 and BSD and LGPLv2+ URL: http://glaros.dtc.umn.edu/gkhome/views/%{name} @@ -37,7 +37,7 @@ Patch4: %{name}_lib64.patch Patch5: %{name}-pcre2.patch BuildRequires: cmake3, gcc, gcc-c++ -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 9 BuildRequires: pcre-devel %else BuildRequires: pcre2-devel @@ -102,7 +102,7 @@ cp -a %{name}-%{version} metis64 %build pushd %{name}-%{version}/build -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 9 PCRE_LDFLAGS="-lpcreposix" %else PCRE_LDFLAGS="-lpcre2-posix" @@ -127,7 +127,7 @@ patch -p0 < %{PATCH2} patch -p0 < %{PATCH4} mkdir -p build64 pushd build64 -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 9 PCRE_LDFLAGS="-lpcreposix" %else PCRE_LDFLAGS="-lpcre2-posix" @@ -265,6 +265,9 @@ popd %endif %changelog +* Fri Jul 17 2020 Merlin Mathesius - 5.1.0-25 +- Minor conditional fixes for ELN + * Wed Jan 29 2020 Fedora Release Engineering - 5.1.0-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild