From c721a4b0014a4735a0dfcd247baf6b0c7891c88c Mon Sep 17 00:00:00 2001 From: Shinwell Hu Date: Mon, 23 Sep 2024 17:24:03 +0800 Subject: [PATCH] rename ninja to python-ninja to avoid conflict (cherry picked from commit d738d8782f90663db83ff0adb95ce49681326a99) --- python-ninja.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/python-ninja.spec b/python-ninja.spec index a0ad72d..70dc4db 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: 3 +Release: 4 Summary: A small build system with a focus on speed. License: Apache-2.0 URL: https://github.com/ninja-build/ninja @@ -23,7 +23,6 @@ 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 @@ -63,11 +62,12 @@ if [ -d usr/share/man ]; then fi popd mv %{buildroot}/doclist.lst . +mv %{buildroot}/%{_bindir}/ninja %{buildroot}/%{_bindir}/python-ninja %files -n python3-ninja %doc README.rst AUTHORS.rst %license LICENSE_Apache_20 -%{_bindir}/ninja +%{_bindir}/python-ninja %{python3_sitearch}/ninja %{python3_sitearch}/ninja*.dist-info/ @@ -76,6 +76,10 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Mon Sep 23 2024 Shinwell Hu - 1.11.1.1-4 +- Python-ninja should never obsolate ninja-build. +- Rename /usr/bin/ninja shipped in this package to /usr/bin/python-ninja + * Mon Apr 08 2024 zhangxianting - 1.11.1.1-3 - Fix install conflicts -- Gitee