From 64ede4f12da191a5f29ff8f444f179da368e9582 Mon Sep 17 00:00:00 2001 From: zhangxianting Date: Mon, 8 Apr 2024 11:11:39 +0800 Subject: [PATCH] Fix install conflicts (cherry picked from commit 8245bb7721681cf9b245ac643335be9269a9897b) --- python-ninja.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-ninja.spec b/python-ninja.spec index abf9f9c..a0ad72d 100644 --- a/python-ninja.spec +++ b/python-ninja.spec @@ -1,7 +1,7 @@ %global _empty_manifest_terminate_build 0 Name: python-ninja Version: 1.11.1.1 -Release: 2 +Release: 3 Summary: A small build system with a focus on speed. License: Apache-2.0 URL: https://github.com/ninja-build/ninja @@ -23,6 +23,7 @@ A small build system with a focus on speed. %package -n python3-ninja Summary: A small build system with a focus on speed. Provides: python-ninja +Obsoletes: ninja-build BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-hatchling @@ -75,6 +76,9 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Mon Apr 08 2024 zhangxianting - 1.11.1.1-3 +- Fix install conflicts + * Fri Jan 19 2024 Dongxing Wang - 1.11.1.1-2 - Fix Eulermaker failure -- Gitee