!4 [sync] PR-3: file /usr/bin/ninja conflicts between attempted installs of python3-ninja- and ninja-build

From: @openeuler-sync-bot 
Reviewed-by: @shinwell_hu 
Signed-off-by: @shinwell_hu
This commit is contained in:
openeuler-ci-bot 2024-04-19 03:44:16 +00:00 committed by Gitee
commit c5543fcb0c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -1,7 +1,7 @@
%global _empty_manifest_terminate_build 0 %global _empty_manifest_terminate_build 0
Name: python-ninja Name: python-ninja
Version: 1.11.1.1 Version: 1.11.1.1
Release: 2 Release: 3
Summary: A small build system with a focus on speed. Summary: A small build system with a focus on speed.
License: Apache-2.0 License: Apache-2.0
URL: https://github.com/ninja-build/ninja URL: https://github.com/ninja-build/ninja
@ -23,6 +23,7 @@ A small build system with a focus on speed.
%package -n python3-ninja %package -n python3-ninja
Summary: A small build system with a focus on speed. Summary: A small build system with a focus on speed.
Provides: python-ninja Provides: python-ninja
Obsoletes: ninja-build
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
BuildRequires: python3-hatchling BuildRequires: python3-hatchling
@ -75,6 +76,9 @@ mv %{buildroot}/doclist.lst .
%{_docdir}/* %{_docdir}/*
%changelog %changelog
* Mon Apr 08 2024 zhangxianting <zhangxianting@uniontech.com> - 1.11.1.1-3
- Fix install conflicts
* Fri Jan 19 2024 Dongxing Wang <dongxing.wang_a@thundersoft.com> - 1.11.1.1-2 * Fri Jan 19 2024 Dongxing Wang <dongxing.wang_a@thundersoft.com> - 1.11.1.1-2
- Fix Eulermaker failure - Fix Eulermaker failure