4 changed files with 43 additions and 118 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/ninja-1.11.1.tar.gz
+SOURCES/ninja-1.10.2.tar.gz
--- a/.ninja-build.metadata
+++ b/.ninja-build.metadata
@ -1 +1 @@
-938723cdfc7a6f7c8f84c83b9a2cecdf1e5e1ad3 SOURCES/ninja-1.11.1.tar.gz
+8d2e8c1c070c27fb9dc46b4a6345bbb1de7ccbaf SOURCES/ninja-1.10.2.tar.gz
--- a/SOURCES/python3.13-pipes.patch
+++ b/SOURCES/python3.13-pipes.patch
@ -1,58 +0,0 @@
-From 9cf13cd1ecb7ae649394f4133d121a01e191560b Mon Sep 17 00:00:00 2001
-From: Byoungchan Lee <byoungchan.lee@gmx.com>
-Date: Mon, 9 Oct 2023 20:13:20 +0900
-Subject: [PATCH 1/2] Replace pipes.quote with shlex.quote in configure.py
-
-Python 3.12 deprecated the pipes module and it will be removed
-in Python 3.13. In configure.py, I have replaced the usage of pipes.quote
-with shlex.quote, which is the exactly same function as pipes.quote.
-
-For more details, refer to PEP 0594: https://peps.python.org/pep-0594
---
- configure.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.py b/configure.py
-index 588250aa8a..c6973cd1a5 100755
--- a/configure.py
-+++ b/configure.py
-@@ -21,7 +21,7 @@
- 
- from optparse import OptionParser
- import os
-import pipes
-+import shlex
- import string
- import subprocess
- import sys
-@@ -262,7 +262,7 @@ def _run_command(self, cmdline):
- env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS'])
- configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys)
- if configure_env:
-    config_str = ' '.join([k + '=' + pipes.quote(configure_env[k])
-+    config_str = ' '.join([k + '=' + shlex.quote(configure_env[k])
-                            for k in configure_env])
-     n.variable('configure_env', config_str + '$ ')
- n.newline()
-
-From 0a9c9c5f50c60de4a7acfed8aaa048c74cd2f43b Mon Sep 17 00:00:00 2001
-From: Byoungchan Lee <byoungchan.lee@gmx.com>
-Date: Mon, 9 Oct 2023 20:13:50 +0900
-Subject: [PATCH 2/2] Remove unused module string in configure.py
-
---
- configure.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.py b/configure.py
-index c6973cd1a5..939153df60 100755
--- a/configure.py
-+++ b/configure.py
-@@ -22,7 +22,6 @@
- from optparse import OptionParser
- import os
- import shlex
-import string
- import subprocess
- import sys
- 
--- a/SPECS/ninja-build.spec
+++ b/SPECS/ninja-build.spec
@ -3,21 +3,22 @@
 %bcond_with bootstrap

 Name:           ninja-build
-Version:        1.11.1
-Release:        9%{?dist}
+Version:        1.10.2
+Release:        6%{?dist}
 Summary:        Small build system with a focus on speed
-License:        Apache-2.0
+License:        ASL 2.0
 URL:            https://ninja-build.org/
 Source0:        https://github.com/ninja-build/ninja/archive/v%{version}/ninja-%{version}.tar.gz
 Source1:        ninja.vim
 Source2:        macros.ninja
-# https://github.com/ninja-build/ninja/pull/2340
-Patch0:         python3.13-pipes.patch
 BuildRequires:  gcc-c++
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BuildRequires:  python2-devel
+%else
 BuildRequires:  python3-devel
+%endif
 %if %{without bootstrap}
 BuildRequires:  asciidoc
-BuildRequires:  gtest-devel
 %endif
 %if !0%{?rhel}
 BuildRequires:  re2c >= 0.11.3
@ -37,8 +38,21 @@ fast as possible.
 %autosetup -n ninja-%{version} -p1

 %build
-%set_build_flags
-%python3 configure.py --bootstrap --verbose
+%if 0%{?set_build_flags:1}
+%{set_build_flags}
+%else
+CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
+CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
+FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS
+FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS
+%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;}
+%endif
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%{__python2} \
+%else
+%{__python3} \
+%endif
+  configure.py --bootstrap --verbose
 ./ninja -v all
 %if %{without bootstrap}
 ./ninja -v manual
@ -52,8 +66,12 @@ install -Dpm0644 misc/ninja-mode.el %{buildroot}%{_datadir}/emacs/site-lisp/ninj
 install -Dpm0644 misc/ninja.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/ninja.vim
 install -Dpm0644 %{S:1} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/ninja.vim
 install -Dpm0644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja
+%if 0%{?rhel} && 0%{?rhel} <= 7
+install -Dpm0644 misc/ninja_syntax.py %{buildroot}%{python2_sitelib}/ninja_syntax.py
+%else
 install -Dpm0644 misc/ninja_syntax.py %{buildroot}%{python3_sitelib}/ninja_syntax.py
 %endif
+%endif
 install -Dpm0644 %{S:2} %{buildroot}%{_rpmmacrodir}/macros.ninja

 # Macro should not change when we are redefining bindir
@ -80,65 +98,30 @@ ln -s ninja %{buildroot}%{_bindir}/ninja-build
 %{_datadir}/vim/vimfiles/syntax/ninja.vim
 %{_datadir}/vim/vimfiles/ftdetect/ninja.vim
 # zsh does not have a -filesystem package
-%dir %{_datadir}/zsh
-%dir %{_datadir}/zsh/site-functions
-%{_datadir}/zsh/site-functions/_ninja
+%{_datadir}/zsh/
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%pycached %{python2_sitelib}/ninja_syntax.py
+%else
 %pycached %{python3_sitelib}/ninja_syntax.py
 %endif
-%{_rpmmacrodir}/macros.ninja
+%endif
+%{rpmmacrodir}/macros.ninja

 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.11.1-9
- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.11.1-8
- Rebuilt for MSVSphere 10
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.11.1-8
- Bump release for June 2024 mass rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Oct 23 2023 Ben Boeckel <fedora@me.benboeckel.net> - 1.11.1-5
- Handle Python 3.13 removal of `pipes`, resolves rhbz#2245655
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 1.11.1-3
- Rebuilt for Python 3.12
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Sep 06 2022 Carl George <carl@george.computer> - 1.11.1-1
- Latest upstream, resolves rhbz#2086337
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.10.2-8
- Rebuilt for Python 3.11
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.2-6
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1.10.2-5
- Rebuilt for Python 3.10
+* Tue May 04 2021 Richard Hughes <rhughes@redhat.com> - 1.10.2-5
+- Do not BR gtest-devel. It appears completely unused.
+- Resolves: rhbz#1975974

 * Tue May 04 2021 Richard Hughes <rhughes@redhat.com> - 1.10.2-4
 - Do not BR re2c on RHEL. It is NTH, and one less package dep to maintain.
+- Resolves: rhbz#1956954

-* Fri Mar 05 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.10.2-3
- Cleanup from unneeded conditions
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.2-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild