Revert to last successful epel8 build

Updating to 3.3.01 or 3.4.00 is not permitted by EPEL policy because it
changes the library soname.  This reverts the spec file to 3.0.00, which
was the last version that built successfully and was shipped in the
repo.

https://fedoraproject.org/wiki/EPEL/GuidelinesAndPolicies#Policy
https://bodhi.fedoraproject.org/updates/FEDORA-EPEL-2020-4d758484f2
This commit is contained in:
Carl George 2021-05-22 16:31:11 -05:00
parent 5cc7ce904f
commit 88e3320b9d
3 changed files with 15 additions and 68 deletions

7
.gitignore vendored
View File

@ -5,10 +5,3 @@
/kokkos-cb90e9484286b8728d821bb5b1c23e74373bc47b.tar.gz /kokkos-cb90e9484286b8728d821bb5b1c23e74373bc47b.tar.gz
/kokkos-e79d6b7311fb91c81477a7fc458ca5408e0c19d2.tar.gz /kokkos-e79d6b7311fb91c81477a7fc458ca5408e0c19d2.tar.gz
/kokkos-3.0.00.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-3.4.00.tar.gz

View File

@ -1,9 +1,6 @@
# Needed for EPEL8
%undefine __cmake_in_source_build
Name: kokkos Name: kokkos
Version: 3.4.00 Version: 3.0.00
%global sover 3.4 %global sover 3.0.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: Kokkos C++ Performance Portability Programming Summary: Kokkos C++ Performance Portability Programming
# no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312 # no support for 32-bit archs https://github.com/kokkos/kokkos/issues/2312
@ -14,7 +11,7 @@ URL: https://github.com/kokkos/kokkos
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: cmake >= 3.16 BuildRequires: cmake3 >= 3.0
BuildRequires: hwloc-devel BuildRequires: hwloc-devel
%global kokkos_desc \ %global kokkos_desc \
@ -38,85 +35,42 @@ Requires: hwloc-devel
This package contains the development files of %{name}. This package contains the development files of %{name}.
%prep %prep
%autosetup -p1 %setup -q
%build %build
%cmake \ mkdir build
pushd build
%{cmake3} \
-DKokkos_ENABLE_TESTS=On \ -DKokkos_ENABLE_TESTS=On \
%ifarch ppc64le
-DKokkos_ARCH_POWER8=ON \
%endif
-DCMAKE_INSTALL_INCLUDEDIR=include/kokkos \ -DCMAKE_INSTALL_INCLUDEDIR=include/kokkos \
-DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON \ -DKokkos_ENABLE_AGGRESSIVE_VECTORIZATION=ON \
-DKokkos_ENABLE_DEPRECATED_CODE=ON \ -DKokkos_ENABLE_DEPRECATED_CODE=ON \
-DKokkos_ENABLE_OPENMP=ON \ -DKokkos_ENABLE_OPENMP=ON \
-DKokkos_ENABLE_SERIAL=ON \ -DKokkos_ENABLE_SERIAL=ON \
-DKokkos_ENABLE_HWLOC=ON \ -DKokkos_ENABLE_HWLOC=ON \
%{nil} ..
%cmake_build %make_build
popd
%install %install
%cmake_install %make_install -C build
%check %check
# https://github.com/kokkos/kokkos/issues/2959 - unstable test make -C build test CTEST_OUTPUT_ON_FAILURE=1 %{?testargs}
%ifarch s390x
%global testargs --exclude-regex KokkosCore_UnitTest_StackTraceTest
%endif
%ctest %{?testargs}
%files %files
%doc README.md %doc README.md
%license LICENSE %license LICENSE
%{_libdir}/libkokkos*.so.%{sover}* %{_libdir}/libkokkos*.so.%{sover}
%files devel %files devel
%{_libdir}/libkokkos*.so %{_libdir}/libkokkos*.so
%{_libdir}/pkgconfig/
%{_libdir}/cmake/Kokkos %{_libdir}/cmake/Kokkos
%{_includedir}/kokkos %{_includedir}/kokkos
%{_bindir}/nvcc_wrapper %{_bindir}/nvcc_wrapper
%{_bindir}/hpcbind
%{_bindir}/kokkos_launch_compiler
%changelog %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)
* 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 * Thu Feb 27 2020 Christoph Junghans <junghans@votca.org> - 3.0.00-1
- Version bump to 3.0.00 - Version bump to 3.0.00

View File

@ -1 +1 @@
SHA512 (kokkos-3.4.00.tar.gz) = 7198e910147b41e936e5f3ae2738aaca91956daf59d51b949b2a36c6754d4dc531d8330134998c70e0bd4911daa3438dcbeeee7d8c054d7004f80ea42d77072d SHA512 (kokkos-3.0.00.tar.gz) = f98feaedfb3b5759fdab35f68ca5b6bd3eacdb658ff0a7b91a33839fa266a8533c76213ebba6445ff7f2430bcdec8d05d7e4c023b63532515ba30223a27f3ebb