From bf0177da1639e66938e5b1794901ebb10f37dc18 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 15 Jul 2021 20:43:59 +0000 Subject: [PATCH] Remove Conflicts: compiler-rt for newer versions of compiler-rt The clang-resource-filesystem package will now prevent a compiler-rt >= 11.0.0 package from being installed at the same time as a newer clang package, so we no longer need to add a conflicts here. --- clang.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/clang.spec b/clang.spec index 34667cb..a91f9dc 100644 --- a/clang.spec +++ b/clang.spec @@ -72,7 +72,7 @@ Name: %pkg_name Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}} -Release: 3%{?dist} +Release: 4%{?dist} Summary: A C language family front-end for LLVM License: NCSA @@ -163,8 +163,7 @@ Requires: gcc-c++ Provides: clang(major) = %{maj_ver} -Conflicts: compiler-rt < %{version} -Conflicts: compiler-rt > %{version} +Conflicts: compiler-rt < 11.0.0 %description clang: noun @@ -563,6 +562,9 @@ false %endif %changelog +* Thu Oct 27 2021 Tom Stellard - 13.0.0-4 +- Remove Conflicts: compiler-rt for newer versions of compiler-rt + * Wed Oct 06 2021 Tom Stellard - 13.0.0-3 - Fix gcc detection with redhat triples