Merge branch 'master' into epel8

.gitignore

@@ -5,3 +5,9 @@
 /kokkos-cb90e9484286b8728d821bb5b1c23e74373bc47b.tar.gz
 /kokkos-e79d6b7311fb91c81477a7fc458ca5408e0c19d2.tar.gz
 /kokkos-3.0.00.tar.gz
+/kokkos-3.1.00.tar.gz
+/kokkos-3.1.01.tar.gz
+/kokkos-3.2.00.tar.gz
+/kokkos-3.2.01.tar.gz
+/kokkos-3.3.00.tar.gz
+/kokkos-3.3.01.tar.gz

kokkos.spec

@@ -1,16 +1,15 @@
 Name:           kokkos
-Version:        3.0.00
-%global         sover 3.0.0
+Version:        3.3.01
+%global         sover 3.3.1
 Release:        1%{?dist}
-Summary:        Kokkos C++ Performance Portability Programming 
-#no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312
+Summary:        Kokkos C++ Performance Portability Programming
+# no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312
 ExcludeArch: i686 armv7hl
 
-License:        BSD 
+License:        BSD
 URL:            https://github.com/kokkos/kokkos
 Source0:        https://github.com/kokkos/kokkos/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-
 BuildRequires:  gcc-c++
 BuildRequires:  cmake3 >= 3.0
 BuildRequires:  hwloc-devel
@@ -39,8 +38,6 @@ This package contains the development files of %{name}.
 %setup -q
 
 %build
-mkdir build
-pushd build
 %{cmake3} \
   -DKokkos_ENABLE_TESTS=On \
   -DCMAKE_INSTALL_INCLUDEDIR=include/kokkos \
@@ -49,15 +46,18 @@ pushd build
   -DKokkos_ENABLE_OPENMP=ON \
   -DKokkos_ENABLE_SERIAL=ON \
   -DKokkos_ENABLE_HWLOC=ON \
-  ..
-%make_build
-popd
+  %{nil}
+%cmake3_build
 
 %install
-%make_install -C build
+%cmake3_install
 
 %check
-make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
+# https://github.com/kokkos/kokkos/issues/2959 - unstable test
+%ifarch s390x
+%global testargs --exclude-regex KokkosCore_UnitTest_StackTraceTest
+%endif
+%ctest3 %{?testargs}
 
 %files
 %doc README.md
@@ -66,12 +66,45 @@ make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
 
 %files devel
 %{_libdir}/libkokkos*.so
-%{_libdir}/pkgconfig/
 %{_libdir}/cmake/Kokkos
 %{_includedir}/kokkos
 %{_bindir}/nvcc_wrapper
+%{_bindir}/hpcbind
+%{_bindir}/kokkos_launch_compiler
 
 %changelog
+* 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)
+
+* Sat Dec 19 13:38:32 MST 2020 Christoph Junghans <junghans@votca.org> - 3.3.00-1
+- Version bump to v3.3.00 (bug #1909362)
+
+* Wed Nov 25 15:26:40 MST 2020 Christoph Junghans <junghans@votca.org> - 3.2.01-1
+- Version bump to v3.2.01 (bug #1901667)
+
+* Tue Aug 25 2020 Christoph Junghans <junghans@votca.org> - 3.2.00-2
+- Fix cmake targets
+
+* Tue Aug 25 2020 Christoph Junghans <junghans@votca.org> - 3.2.00-1
+- Version bump to v3.2.00 (bug #1872456)
+
+* Mon Aug 03 2020 Christoph Junghans <junghans@votca.org> - 3.1.01-4
+- Fix out-of-source build on F33 (bug #1863948)
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.01-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.01-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed May 06 2020 Christoph Junghans <junghans@votca.org> - 3.1.01-1
+- Version bump to v3.1.01 (bug #1824998)
+- drop 2961.patch - merge upstream
+
+* Thu Apr 16 2020 Christoph Junghans <junghans@votca.org> - 3.1.00-1
+- Version bump to v3.1.00 (bug #1824998)
+
 * Thu Feb 27 2020 Christoph Junghans <junghans@votca.org> - 3.0.00-1
 - Version bump to 3.0.00
 

sources

@@ -1 +1 @@
-SHA512 (kokkos-3.0.00.tar.gz) = f98feaedfb3b5759fdab35f68ca5b6bd3eacdb658ff0a7b91a33839fa266a8533c76213ebba6445ff7f2430bcdec8d05d7e4c023b63532515ba30223a27f3ebb
+SHA512 (kokkos-3.3.01.tar.gz) = 9271be6ef080ac60b588b20d6d13c654311221691295dda199bbb833ab3fda7024aa0672ca3304f07824507e8d0708b7f58d8a707b84ad08e82357e00fe8fcae