diff --git a/.gitignore b/.gitignore index b62ec32..7205ecf 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ /openmp-10.0.0.src.tar.xz.sig /openmp-11.0.0rc1.src.tar.xz.sig /openmp-11.0.0rc1.src.tar.xz +/openmp-11.0.0rc2.src.tar.xz +/openmp-11.0.0rc2.src.tar.xz.sig diff --git a/libomp.spec b/libomp.spec index fa1083a..bf91e01 100644 --- a/libomp.spec +++ b/libomp.spec @@ -1,4 +1,4 @@ -%global rc_ver 1 +%global rc_ver 2 %global baserelease 0.1 %global libomp_srcdir openmp-%{version}%{?rc_ver:rc%{rc_ver}}.src @@ -16,16 +16,11 @@ Summary: OpenMP runtime for clang License: NCSA URL: http://openmp.llvm.org -%if 0%{?rc_ver:1} -Source0: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{libomp_srcdir}.tar.xz -Source3: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{libomp_srcdir}.tar.xz.sig -%else -Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{libomp_srcdir}.tar.xz -Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{libomp_srcdir}.tar.xz.sig -%endif -Source1: run-lit-tests -Source2: lit.fedora.cfg.py -Source4: https://prereleases.llvm.org/%{version}/hans-gpg-key.asc +Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz +Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz.sig +Source2: https://prereleases.llvm.org/%{version}/hans-gpg-key.asc +Source3: run-lit-tests +Source4: lit.fedora.cfg.py Patch0: 0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch @@ -71,7 +66,7 @@ Requires: python3-lit OpenMP regression tests %prep -%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE0}' +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -n %{libomp_srcdir} -p1 %build @@ -108,14 +103,14 @@ cp -R runtime/src %{buildroot}%{libomp_srcdir}/runtime head -n -1 %{_vpath_builddir}/runtime/test/lit.site.cfg >> %{buildroot}%{lit_cfg} # Install custom fedora config file -cp %{SOURCE2} %{buildroot}%{lit_fedora_cfg} +cp %{SOURCE4} %{buildroot}%{lit_fedora_cfg} # Patch lit config files to load custom fedora config echo "lit_config.load_config(config, '%{lit_fedora_cfg}')" >> %{buildroot}%{lit_cfg} # Install test script install -d %{buildroot}%{_libexecdir}/tests/libomp -install -m 0755 %{SOURCE1} %{buildroot}%{_libexecdir}/tests/libomp +install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/tests/libomp # Remove static libraries with equivalent shared libraries rm -rf %{buildroot}%{_libdir}/libarcher_static.a @@ -149,6 +144,9 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a %{_libexecdir}/tests/libomp/ %changelog +* Tue Sep 01 2020 sguelton@redhat.com - 11.0.0-0.1.rc2 +- 11.0.0-rc2 Release + * Mon Aug 10 2020 Tom Stellard - 11.0.0-0.1.rc1 - 11.0.0-rc1 Release diff --git a/sources b/sources index 69be7c9..4580438 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (openmp-11.0.0rc1.src.tar.xz.sig) = 5f1aac5b8592b2b9d8ea98275f3abd2058adccea170f71a9f6a9a51af8185ef6c85ce1a833a475611966921594d5cfaa571eaa5d39aad98b9af0adaac9863c8b -SHA512 (openmp-11.0.0rc1.src.tar.xz) = f732256d1f4f4921d2aaf5997819c9d00a379b359c6a3e7795fd393c241415f0069df5b179a7004b61045e4de37736bad9ca759aca79c0bbe93aa5420757a6d2 +SHA512 (openmp-11.0.0rc2.src.tar.xz) = 697bb54cfb7760a4f6454a84c4597d70d205045ba932d3e6cd8932f9eff0a1b4fd8ef86951172aa0ffb13e39da907f284900b5f3c77f7a00bda098e3dc098a30 +SHA512 (openmp-11.0.0rc2.src.tar.xz.sig) = 449abe24564e6d9e63e43d4ece26d454114f9e592251ea27e1f4b7c491ee6d24319ec4b18fec76ce595e5a769c2337154bd97c509c46361dda02c153aa627b74