public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Karolina Surma <ksurma@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ninja-build] rawhide: Don't build the Python package during bootstrap build
Date: Wed, 03 Jun 2026 10:01:27 GMT [thread overview]
Message-ID: <178048088728.1.10769924665503914277.rpms-ninja-build-9dc49ce00c73@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ninja-build
Branch : rawhide
Commit : 9dc49ce00c7347b618cf40d11fb906d5773cc547
Author : Karolina Surma <ksurma@redhat.com>
Date : 2026-05-26T18:40:35+02:00
Stats : +11/-2 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/ninja-build/c/9dc49ce00c7347b618cf40d11fb906d5773cc547?branch=rawhide
Log:
Don't build the Python package during bootstrap build
Keep the bootstrapped package minimal
---
diff --git a/ninja-build.spec b/ninja-build.spec
index af08821..65e0488 100644
--- a/ninja-build.spec
+++ b/ninja-build.spec
@@ -4,7 +4,7 @@
Name: ninja-build
Version: 1.13.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Small build system with a focus on speed
License: Apache-2.0
URL: https://ninja-build.org/
@@ -33,6 +33,7 @@ build systems in two major respects: it is designed to have its input files
generated by a higher-level build system, and it is designed to run builds as
fast as possible.
+%if %{without bootstrap}
%package -n python3-ninja
Summary: Python metadata for packages depending on ninja
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -42,6 +43,7 @@ BuildArch: noarch
Package provides metadata only for Python packages depending on ninja.
This is to make automatic dependency resolution work. The package is NOT
using anything from the PyPI package called ninja.
+%endif
%prep
%autosetup -n ninja-%{version} -p1
@@ -59,7 +61,6 @@ PATH=$(pwd):"$PATH" %cmake \
-B cmake-build \
-DCMAKE_BUILD_TYPE=Release
./ninja -C cmake-build ninja_test
-%endif
# Provide Python metadata
%global ninja_distinfo ninja-%{version}.dist-info
@@ -75,6 +76,7 @@ Metadata only package for automatic dependency resolution in the RPM
ecosystem. This package is separate from the PyPI package called ninja.
EOF
echo rpm > %{ninja_distinfo}/INSTALLER
+%endif
%install
install -Dpm0755 ninja -t %{buildroot}%{_bindir}/
@@ -92,8 +94,10 @@ sed -i -e "/^%%__ninja /s| .*$| %{_bindir}/ninja|" %{buildroot}%{_rpmmacrodir}/m
ln -s ninja %{buildroot}%{_bindir}/ninja-build
+%if %{without bootstrap}
# Install Python metadata
cp -a %{ninja_distinfo} %{buildroot}%{python3_sitelib}
+%endif
%if %{without bootstrap}
%check
@@ -120,11 +124,16 @@ cp -a %{ninja_distinfo} %{buildroot}%{python3_sitelib}
%endif
%{_rpmmacrodir}/macros.ninja
+%if %{without bootstrap}
%files -n python3-ninja
%{python3_sitelib}/%{ninja_distinfo}
+%endif
%changelog
+* Tue May 26 2026 Karolina Surma <ksurma@redhat.com> - 1.13.2-3
+- Don't build Python package when bootstrapping ninja-build
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
reply other threads:[~2026-06-03 10:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178048088728.1.10769924665503914277.rpms-ninja-build-9dc49ce00c73@fedoraproject.org \
--to=ksurma@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox