Remove old conditions

This commit is contained in:
sagitter 2020-01-25 21:28:28 +01:00
parent ff83310368
commit e45bb31c27

View File

@ -8,7 +8,7 @@
Name: metis Name: metis
Version: 5.1.0 Version: 5.1.0
Release: 22%{?dist} Release: 23%{?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,11 +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} && 0%{?fedora} < 30
BuildRequires: pcre-devel
%else
BuildRequires: pcre2-devel BuildRequires: pcre2-devel
%endif
BuildRequires: help2man BuildRequires: help2man
BuildRequires: chrpath BuildRequires: chrpath
@ -90,9 +86,7 @@ pushd %{name}-%{version}
%patch0 -p0 %patch0 -p0
%patch1 -p0 %patch1 -p0
%patch3 -p0 %patch3 -p0
%if 0%{?fedora} > 29
%patch5 -p0 %patch5 -p0
%endif
## Remove default compiler flag ## Remove default compiler flag
sed -e 's|-O3||g' -i GKlib/GKlibSystem.cmake sed -e 's|-O3||g' -i GKlib/GKlibSystem.cmake
@ -104,7 +98,7 @@ cp -a %{name}-%{version} metis64
%build %build
pushd %{name}-%{version}/build pushd %{name}-%{version}/build
%if 0%{?rhel} && 0%{?fedora} < 30 %if 0%{?rhel}
PCRE_LDFLAGS="-lpcreposix" PCRE_LDFLAGS="-lpcreposix"
%else %else
PCRE_LDFLAGS="-lpcre2-posix" PCRE_LDFLAGS="-lpcre2-posix"
@ -129,7 +123,7 @@ patch -p0 < %{PATCH2}
patch -p0 < %{PATCH4} patch -p0 < %{PATCH4}
mkdir -p build64 mkdir -p build64
pushd build64 pushd build64
%if 0%{?rhel} && 0%{?fedora} < 30 %if 0%{?rhel}
PCRE_LDFLAGS="-lpcreposix" PCRE_LDFLAGS="-lpcreposix"
%else %else
PCRE_LDFLAGS="-lpcre2-posix" PCRE_LDFLAGS="-lpcre2-posix"
@ -267,6 +261,9 @@ popd
%endif %endif
%changelog %changelog
* Sat Jan 25 2020 Antonio Trande <sagitter@fedoraproject.org> - 5.1.0-23
- Remove old conditions
* Thu Oct 24 2019 Antonio Trande <sagitter@fedoraproject.org> - 5.1.0-22 * Thu Oct 24 2019 Antonio Trande <sagitter@fedoraproject.org> - 5.1.0-22
- Fix descriptions - Fix descriptions