From ac3a81223a8e7a7c81a033ea3d800f8a098ed5db Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 23 Oct 2023 16:00:15 +0200 Subject: [PATCH] Add Conflicts to llvm-googletest Resolves: RHEL-9028 --- llvm.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/llvm.spec b/llvm.spec index 49913f5..9b644fc 100644 --- a/llvm.spec +++ b/llvm.spec @@ -118,7 +118,7 @@ Name: %{pkg_name} Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Low Level Virtual Machine License: Apache-2.0 WITH LLVM-exception OR NCSA @@ -265,6 +265,8 @@ LLVM regression tests. %package googletest Summary: LLVM's modified googletest sources +# libllvm_gtest.a moved from llvm-static to llvm-googletest +Conflicts: %{name}-static < 17.0.0 %description googletest LLVM's modified googletest sources. @@ -650,6 +652,9 @@ fi %endif %changelog +* Mon Oct 23 2023 Nikita Popov - 17.0.2-2 +- Add Conflicts to llvm-googletest + * Wed Oct 04 2023 Nikita Popov - 17.0.2-1 - Update to LLVM 17.0.2