diff --git a/metis.spec b/metis.spec index 879fb40..b7de54d 100644 --- a/metis.spec +++ b/metis.spec @@ -1,7 +1,3 @@ -%if 0%{?fedora} <= 22 -%global _hardened_build 1 -%endif - %if 0%{?rhel} < 7 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} %endif @@ -14,7 +10,7 @@ Name: metis Version: 5.1.0 -Release: 18%{?dist} +Release: 19%{?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} @@ -40,7 +36,7 @@ Patch3: %{name}-GKREGEX-GKRAND-LIBSUFFIX-fix.patch ## Rename library of 64 integer version Patch4: %{name}_lib64.patch -BuildRequires: cmake, gcc, gcc-c++ +BuildRequires: cmake3, gcc, gcc-c++ BuildRequires: pcre-devel BuildRequires: help2man BuildRequires: chrpath @@ -63,7 +59,6 @@ Header and library files of Metis, OpenMP version. %if 0%{?arch64} %package -n metis64 Summary: Serial Graph Partitioning and Fill-reducing Matrix Ordering (64bit INTEGER) -Group: System Environment/Libraries %description -n metis64 METIS is a set of serial programs for partitioning graphs, @@ -85,12 +80,9 @@ OpenMP version (64bit INTEGER). %endif %prep -%setup -qc +%autosetup -p0 -c pushd %{name}-%{version} -%patch0 -p0 -%patch1 -p0 -%patch3 -p0 ## Remove default compiler flag sed -e 's|-O3||g' -i GKlib/GKlibSystem.cmake @@ -102,8 +94,7 @@ cp -a %{name}-%{version} metis64 %build pushd %{name}-%{version}/build -export CC=gcc -%cmake \ +%cmake3 \ -DGKLIB_PATH=../GKlib \ -DSHARED:BOOL=TRUE \ -DOPENMP:BOOL=ON \ @@ -113,7 +104,7 @@ export CC=gcc -DCMAKE_EXE_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} -fPIC -pie -Wl,-z,now" \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} .. -make %{?_smp_mflags} +%make_build popd %if 0%{?arch64} @@ -122,8 +113,7 @@ patch -p0 < %{PATCH2} patch -p0 < %{PATCH4} mkdir -p build64 pushd build64 -export CC=gcc -%cmake \ +%cmake3 \ -DGKLIB_PATH=../GKlib \ -DSHARED:BOOL=TRUE \ -DOPENMP:BOOL=ON \ @@ -133,7 +123,7 @@ export CC=gcc -DCMAKE_EXE_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} -fPIC -pie -Wl,-z,now" \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} .. -make %{?_smp_mflags} +%make_build popd cd ../ %endif @@ -221,7 +211,6 @@ popd %endif %files -%{!?_licensedir:%global license %doc} %doc %{name}-%{version}/Changelog %{name}-%{version}/manual/manual.pdf %license %{name}-%{version}/LICENSE.txt %{_bindir}/cmpfillin @@ -239,7 +228,6 @@ popd %if 0%{?arch64} %files -n metis64 -%{!?_licensedir:%global license %doc} %doc metis64/Changelog metis64/manual/manual.pdf %license metis64/LICENSE.txt %{_bindir}/cmpfillin64 @@ -256,6 +244,9 @@ popd %endif %changelog +* Sun Nov 04 2018 Antonio Trande - 5.1.0-19 +- Some minor changes + * Fri Jul 13 2018 Fedora Release Engineering - 5.1.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild