Minor conditional fixes for ELN

Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>
This commit is contained in:
Merlin Mathesius 2020-07-17 14:09:27 -05:00
parent 30336cf322
commit 92ad9dfa53

View File

@ -8,7 +8,7 @@
Name: metis Name: metis
Version: 5.1.0 Version: 5.1.0
Release: 24%{?dist} Release: 25%{?dist}
Summary: Serial Graph Partitioning and Fill-reducing Matrix Ordering Summary: Serial Graph Partitioning and Fill-reducing Matrix Ordering
License: ASL 2.0 and BSD and LGPLv2+ License: ASL 2.0 and BSD and LGPLv2+
URL: http://glaros.dtc.umn.edu/gkhome/views/%{name} URL: http://glaros.dtc.umn.edu/gkhome/views/%{name}
@ -37,7 +37,7 @@ Patch4: %{name}_lib64.patch
Patch5: %{name}-pcre2.patch Patch5: %{name}-pcre2.patch
BuildRequires: cmake3, gcc, gcc-c++ BuildRequires: cmake3, gcc, gcc-c++
%if 0%{?rhel} %if 0%{?rhel} && 0%{?rhel} < 9
BuildRequires: pcre-devel BuildRequires: pcre-devel
%else %else
BuildRequires: pcre2-devel BuildRequires: pcre2-devel
@ -102,7 +102,7 @@ cp -a %{name}-%{version} metis64
%build %build
pushd %{name}-%{version}/build pushd %{name}-%{version}/build
%if 0%{?rhel} %if 0%{?rhel} && 0%{?rhel} < 9
PCRE_LDFLAGS="-lpcreposix" PCRE_LDFLAGS="-lpcreposix"
%else %else
PCRE_LDFLAGS="-lpcre2-posix" PCRE_LDFLAGS="-lpcre2-posix"
@ -127,7 +127,7 @@ patch -p0 < %{PATCH2}
patch -p0 < %{PATCH4} patch -p0 < %{PATCH4}
mkdir -p build64 mkdir -p build64
pushd build64 pushd build64
%if 0%{?rhel} %if 0%{?rhel} && 0%{?rhel} < 9
PCRE_LDFLAGS="-lpcreposix" PCRE_LDFLAGS="-lpcreposix"
%else %else
PCRE_LDFLAGS="-lpcre2-posix" PCRE_LDFLAGS="-lpcre2-posix"
@ -265,6 +265,9 @@ popd
%endif %endif
%changelog %changelog
* Fri Jul 17 2020 Merlin Mathesius <mmathesi@redhat.com> - 5.1.0-25
- Minor conditional fixes for ELN
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-24 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild