From a3d42cb72f9e68a4ba48dbbe97d8e4a2bfca6216 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Aug 01 2020 21:33:23 +0000
Subject: Use %cmake_build/%cmake_install


---

diff --git a/cgnslib.spec b/cgnslib.spec
index de88749..cf753d9 100644
--- a/cgnslib.spec
+++ b/cgnslib.spec
@@ -62,22 +62,19 @@ chmod a-x src/cgnstools/utilities/cgns_to_vtk.c
 %build
 # This is needed for GCC10, whenever a new cgnslib release is published, check whether it is still needed
 export FCFLAGS+=-fallow-argument-mismatch
-%cmake3 -DCMAKE_SKIP_RPATH=ON \
+%cmake -DCMAKE_SKIP_RPATH=ON \
        -DCGNS_ENABLE_TESTS=ON \
        -DCGNS_ENABLE_FORTRAN=ON \
        -DCGNS_BUILD_CGNSTOOLS=ON \
        -DCGNS_ENABLE_HDF5=ON \
-       -DCMAKE_Fortran_FLAGS_RELEASE:STRING="$FCFLAGS -DNDEBUG $LDFLAGS -lhdf5 -fPIC" \
-       .
+       -DCMAKE_Fortran_FLAGS_RELEASE:STRING="$FCFLAGS -DNDEBUG $LDFLAGS -lhdf5 -fPIC"
 
-#make_build
-
-# FIXME: Ugly workaround for build order issue which results in
-# an incomplete libcgns.so being created during the first run
-make || rm src/libcgns.so* && make
+# Parallel build broken
+%global _smp_mflags -j1
+%cmake_build
 
 %install
-%make_install
+%cmake_install
 find %{buildroot} -name '*.a' -delete -print
 
 # Add shebang
@@ -91,10 +88,10 @@ mv %{buildroot}%{_includedir}/cgns.mod %{buildroot}%{_libdir}/gfortran/modules
 
 %check
 export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
-%ifarch ppc64le
-%ctest3 --force-new-ctest-process || :
+%ifarch ppc64le aarch64
+%ctest --force-new-ctest-process || :
 %else
-%ctest3 --force-new-ctest-process
+%ctest --force-new-ctest-process
 %endif