diff --git a/metis.spec b/metis.spec index 220ab47..342dc50 100644 --- a/metis.spec +++ b/metis.spec @@ -1,5 +1,4 @@ %undefine _ld_as_needed -%global __cmake_in_source_build 1 %if %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} == 64 %global arch64 1 @@ -9,7 +8,7 @@ Name: metis Version: 5.1.0 -Release: 27%{?dist} +Release: 28%{?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} @@ -103,13 +102,12 @@ cp -a %{name}-%{version} metis64 %endif %build -pushd %{name}-%{version}/build %if 0%{?rhel} && 0%{?rhel} < 9 PCRE_LDFLAGS="-lpcreposix" %else PCRE_LDFLAGS="-lpcre2-posix" %endif -%cmake3 \ +%cmake3 -S %{name}-%{version} -B %{name}-%{version}/build \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DGKLIB_PATH=../GKlib \ -DSHARED:BOOL=TRUE \ @@ -119,22 +117,20 @@ PCRE_LDFLAGS="-lpcre2-posix" -DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} $PCRE_LDFLAGS" \ -DCMAKE_EXE_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} $PCRE_LDFLAGS" \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} .. -%make_build -popd + -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} +%make_build -C %{name}-%{version}/build %if 0%{?arch64} cd metis64 patch -p0 < %{PATCH2} patch -p0 < %{PATCH4} mkdir -p build64 -pushd build64 %if 0%{?rhel} && 0%{?rhel} < 9 PCRE_LDFLAGS="-lpcreposix" %else PCRE_LDFLAGS="-lpcre2-posix" %endif -%cmake3 \ +%cmake3 -S %{name}-%{version} -B %{name}-%{version}/build64 \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DGKLIB_PATH=../GKlib \ -DSHARED:BOOL=TRUE \ @@ -145,8 +141,7 @@ PCRE_LDFLAGS="-lpcre2-posix" -DCMAKE_EXE_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} $PCRE_LDFLAGS" \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} .. -%make_build -popd +%make_build -C %{name}-%{version}/build64 cd ../ %endif @@ -226,12 +221,6 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH ./graphchk64 4elt.graph %endif popd -%ldconfig_scriptlets - -%if 0%{?arch64} -%ldconfig_scriptlets -n metis64 -%endif - %files %doc %{name}-%{version}/Changelog %{name}-%{version}/manual/manual.pdf %license %{name}-%{version}/LICENSE.txt @@ -267,6 +256,9 @@ popd %endif %changelog +* Sat Jan 23 2021 Antonio Trande - 5.1.0-28 +- Change CMake options + * Sat Aug 01 2020 Fedora Release Engineering - 5.1.0-27 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild