From cc00d8055c493c5866da140a05b6ffc8ee3cda23 Mon Sep 17 00:00:00 2001 From: eastb233 Date: Thu, 25 Aug 2022 19:58:11 +0800 Subject: [PATCH] [RPM] delete bundled(*) Provides in case of conflict with default gcc --- gcc-12.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gcc-12.spec b/gcc-12.spec index 71aaf4b..4487f2c 100644 --- a/gcc-12.spec +++ b/gcc-12.spec @@ -2,7 +2,7 @@ %global gcc_version 12.1.1 %global gcc_major 12 -%global gcc_release 2 +%global gcc_release 3 %global isl_version 0.18 %global _unpackaged_files_terminate_build 0 @@ -131,9 +131,9 @@ Requires: %{?scl_prefix}libasan = %{version}-%{release} # lto-wrapper invokes make Requires: make AutoReq: true -Provides: bundled(libiberty) -Provides: bundled(libbacktrace) -Provides: bundled(libffi) +#Provides: bundled(libiberty) +#Provides: bundled(libbacktrace) +#Provides: bundled(libffi) Provides: %{?scl_prefix}gcc(major) = %{gcc_major} @@ -2670,6 +2670,9 @@ end %doc rpm.doc/changelogs/libcc1/ChangeLog* %changelog +* Thu Aug 25 2022 eastb233 12.1.1-3 +- delete bundled(*) Provides in case of conflict with default gcc + * Wed Aug 24 2022 eastb233 12.1.1-2 - delete the Provides of lib.* files in rpm package -- Gitee