Fix ELN build

ELN (RHEL 10) tracks rawhide and currently also has llvm-17.
This commit is contained in:
Yaakov Selkowitz 2023-09-20 14:17:19 -04:00 committed by Josh Stone
parent b1db162b38
commit da52e5d316
1 changed files with 5 additions and 2 deletions

View File

@ -85,7 +85,7 @@
Name: rust Name: rust
Version: 1.72.1 Version: 1.72.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: The Rust Programming Language Summary: The Rust Programming Language
License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-DFS-2016) License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-DFS-2016)
# ^ written as: (rust itself) and (bundled libraries) # ^ written as: (rust itself) and (bundled libraries)
@ -237,7 +237,7 @@ BuildRequires: cmake >= 2.8.11
%global llvm llvm14 %global llvm llvm14
%endif %endif
# not ready for llvm-17 yet... # not ready for llvm-17 yet...
%if 0%{?fedora} >= 39 %if 0%{?fedora} >= 39 || 0%{?rhel} >= 10
%global llvm llvm16 %global llvm llvm16
%endif %endif
%if %defined llvm %if %defined llvm
@ -1088,6 +1088,9 @@ end}
%changelog %changelog
* Mon Sep 25 2023 Josh Stone <jistone@redhat.com> - 1.72.1-2
- Fix LLVM dependency for ELN
* Tue Sep 19 2023 Josh Stone <jistone@redhat.com> - 1.72.1-1 * Tue Sep 19 2023 Josh Stone <jistone@redhat.com> - 1.72.1-1
- Update to 1.72.1. - Update to 1.72.1.
- Migrated to SPDX license - Migrated to SPDX license