Merge branch 'rawhide' into epel8

Fixes the build for EPEL8 with RHEL 8.4+

.gitignore

@@ -11,3 +11,4 @@
 /kokkos-3.2.01.tar.gz
 /kokkos-3.3.00.tar.gz
 /kokkos-3.3.01.tar.gz
+/kokkos-3.4.00.tar.gz

kokkos.spec

@@ -1,6 +1,9 @@
+# Needed for EPEL8
+%undefine __cmake_in_source_build
+
 Name:           kokkos
-Version:        3.3.01
-%global         sover 3.3.1
+Version:        3.4.00
+%global         sover 3.4
 Release:        1%{?dist}
 Summary:        Kokkos C++ Performance Portability Programming
 # no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312
@@ -8,10 +11,10 @@ ExcludeArch: i686 armv7hl
 
 License:        BSD
 URL:            https://github.com/kokkos/kokkos
-Source0:        https://github.com/kokkos/kokkos/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  gcc-c++
-BuildRequires:  cmake3 >= 3.0
+BuildRequires:  cmake >= 3.16
 BuildRequires:  hwloc-devel
 
 %global kokkos_desc \
@@ -35,11 +38,14 @@ Requires:       hwloc-devel
 This package contains the development files of %{name}.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
-%{cmake3} \
+%cmake \
   -DKokkos_ENABLE_TESTS=On \
+%ifarch ppc64le
+  -DKokkos_ARCH_POWER8=ON \
+%endif
   -DCMAKE_INSTALL_INCLUDEDIR=include/kokkos \
   -DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON \
   -DKokkos_ENABLE_DEPRECATED_CODE=ON \
@@ -47,22 +53,22 @@ This package contains the development files of %{name}.
   -DKokkos_ENABLE_SERIAL=ON \
   -DKokkos_ENABLE_HWLOC=ON \
   %{nil}
-%cmake3_build
+%cmake_build
 
 %install
-%cmake3_install
+%cmake_install
 
 %check
 # https://github.com/kokkos/kokkos/issues/2959 - unstable test
 %ifarch s390x
 %global testargs --exclude-regex KokkosCore_UnitTest_StackTraceTest
 %endif
-%ctest3 %{?testargs}
+%ctest %{?testargs}
 
 %files
 %doc README.md
 %license LICENSE
-%{_libdir}/libkokkos*.so.%{sover}
+%{_libdir}/libkokkos*.so.%{sover}*
 
 %files devel
 %{_libdir}/libkokkos*.so
@@ -73,6 +79,12 @@ This package contains the development files of %{name}.
 %{_bindir}/kokkos_launch_compiler
 
 %changelog
+* Tue Apr 27 2021 Christoph Junghans <junghans@votca.org> - 3.4.00-1
+- Version bump to v3.4.00 (bug #1953967)
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.01-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Sat Jan 23 08:19:42 MST 2021 Christoph Junghans <junghans@lanl.gov> - 3.3.01-1
 - Version bump to v3.3.01 (bug #1919508)
 

sources

@@ -1 +1 @@
-SHA512 (kokkos-3.3.01.tar.gz) = 9271be6ef080ac60b588b20d6d13c654311221691295dda199bbb833ab3fda7024aa0672ca3304f07824507e8d0708b7f58d8a707b84ad08e82357e00fe8fcae
+SHA512 (kokkos-3.4.00.tar.gz) = 7198e910147b41e936e5f3ae2738aaca91956daf59d51b949b2a36c6754d4dc531d8330134998c70e0bd4911daa3438dcbeeee7d8c054d7004f80ea42d77072d