diff --git a/psi4.spec b/psi4.spec index 97789e1..8347c62 100644 --- a/psi4.spec +++ b/psi4.spec @@ -1,7 +1,7 @@ Name: psi4 Epoch: 1 Version: 1.3.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An ab initio quantum chemistry package License: LGPLv3 and MIT URL: http://www.psicode.org/ @@ -100,9 +100,7 @@ This package contains static libraries and development headers for psi. export F77=gfortran export FC=gfortran -mkdir objdir-%{_target_platform} -cd objdir-%{_target_platform} -%cmake .. \ +%cmake \ -DENABLE_OPENMP=ON -DENABLE_MPI=OFF -DENABLE_XHOST=OFF \ -DBLAS_LIBRARIES='-lopenblaso' -DLAPACK_LIBRARIES='-lopenblaso' -DENABLE_AUTO_LAPACK=OFF \ -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ \ @@ -113,10 +111,10 @@ cd objdir-%{_target_platform} #libefp turned off since it needs a separate Python wrapper # Build program -make %{?_smp_mflags} VERBOSE=1 +%cmake_build %install -make -C objdir-%{_target_platform} install DESTDIR=%{buildroot} +%cmake_install # Get rid of spurious files rm -rf %{buildroot}%{_builddir} @@ -129,7 +127,7 @@ rm -rf %{buildroot}%{_datadir}/cmake/TargetLAPACK/ %check # Run quick tests to see the program works. # quicktests are too long, whole test suite way too long. -cd objdir-%{_target_platform}/tests +cd %{_vpath_builddir}/tests ctest -L smoketests %files @@ -149,6 +147,9 @@ ctest -L smoketests %{_libdir}/psi4/ %changelog +* Wed Aug 05 2020 Susi Lehtola - 1:1.3.2-6 +- Adapt to new CMake scripts. + * Sat Aug 01 2020 Fedora Release Engineering - 1:1.3.2-5 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild