[RPM] delete bundled(*) Provides in case of conflict with default gcc

This commit is contained in:
eastb233 2022-08-25 19:58:11 +08:00
parent c70b57b1b4
commit cc00d8055c

View File

@ -2,7 +2,7 @@
%global gcc_version 12.1.1 %global gcc_version 12.1.1
%global gcc_major 12 %global gcc_major 12
%global gcc_release 2 %global gcc_release 3
%global isl_version 0.18 %global isl_version 0.18
%global _unpackaged_files_terminate_build 0 %global _unpackaged_files_terminate_build 0
@ -131,9 +131,9 @@ Requires: %{?scl_prefix}libasan = %{version}-%{release}
# lto-wrapper invokes make # lto-wrapper invokes make
Requires: make Requires: make
AutoReq: true AutoReq: true
Provides: bundled(libiberty) #Provides: bundled(libiberty)
Provides: bundled(libbacktrace) #Provides: bundled(libbacktrace)
Provides: bundled(libffi) #Provides: bundled(libffi)
Provides: %{?scl_prefix}gcc(major) = %{gcc_major} Provides: %{?scl_prefix}gcc(major) = %{gcc_major}
@ -2670,6 +2670,9 @@ end
%doc rpm.doc/changelogs/libcc1/ChangeLog* %doc rpm.doc/changelogs/libcc1/ChangeLog*
%changelog %changelog
* Thu Aug 25 2022 eastb233 <xiezhiheng@huawei.com> 12.1.1-3
- delete bundled(*) Provides in case of conflict with default gcc
* Wed Aug 24 2022 eastb233 <xiezhiheng@huawei.com> 12.1.1-2 * Wed Aug 24 2022 eastb233 <xiezhiheng@huawei.com> 12.1.1-2
- delete the Provides of lib.* files in rpm package - delete the Provides of lib.* files in rpm package