#117 Remove Conflicts: compiler-rt
Merged 2 years ago by tstellar. Opened 2 years ago by tstellar.
rpms/ tstellar/clang crt-noconflict  into  rawhide

file modified
+5 -3
@@ -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 @@ 

  

  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 @@ 

  

  %endif

  %changelog

+ * Thu Oct 27 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0-4

+ - Remove Conflicts: compiler-rt for newer versions of compiler-rt

+ 

  * Wed Oct 06 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0-3

  - Fix gcc detection with redhat triples

  

The clang-resource-filesystem package will now prevent an older
compiler-rt package from being installed at the same time as a
newer clang package, so we no longer need to add a conflicts here.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Why is that going to prevent the conflict with older version of compiler-rt that don't use the clang-resource-filesystem package yet?

Why is that going to prevent the conflict with older version of compiler-rt that don't use the clang-resource-filesystem package yet?

It won't. It would be nice not to have to carry around the conflicts forever, but I'll add one for < 11.0.0.

rebased onto 0588837ae43d39aedb3bfaaf40a564c1dbb19b63

2 years ago

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

rebased onto 94912027f8a9b833c40eabf08478fc668d69c926

2 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

rebased onto 0836db8ea59754c17b65cb02203aa6bc3262936e

2 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

rebased onto d99713b

2 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

rebased onto 15cac740b2e94ae3e13b4144038a04dc72715a4b

2 years ago

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

@tstellar this one LGTM but needs a rebase.

rebased onto bf0177d

2 years ago

Pull-Request has been merged by tstellar

2 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Metadata