.gitignore

@@ -1 +1 @@
-SOURCES/ninja-1.8.2.tar.gz
+SOURCES/ninja-1.10.2.tar.gz

.ninja-build.metadata

@@ -1 +1 @@
-17219deb34dd816363e37470f77ff7231509143a SOURCES/ninja-1.8.2.tar.gz
+8d2e8c1c070c27fb9dc46b4a6345bbb1de7ccbaf SOURCES/ninja-1.10.2.tar.gz

SPECS/ninja-build.spec

@@ -1,10 +1,14 @@
+# Set to bcond_without or use --with bootstrap,
+# when bootstrapping a new architecture.
+%bcond_with bootstrap
+
 Name:           ninja-build
-Version:        1.8.2
+Version:        1.10.2
-Release:        1%{?dist}
+Release:        6%{?dist}
-Summary:        A small build system with a focus on speed
+Summary:        Small build system with a focus on speed
 License:        ASL 2.0
-URL:            http://martine.github.com/ninja/
+URL:            https://ninja-build.org/
-Source0:        https://github.com/martine/ninja/archive/v%{version}/ninja-%{version}.tar.gz
+Source0:        https://github.com/ninja-build/ninja/archive/v%{version}/ninja-%{version}.tar.gz
 Source1:        ninja.vim
 Source2:        macros.ninja
 BuildRequires:  gcc-c++
@@ -13,11 +17,16 @@ 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
+%endif
+%if %{without bootstrap}
 Requires:       emacs-filesystem
 Requires:       vim-filesystem
+%endif
 
 %description
 Ninja is a small build system with a focus on speed. It differs from other
@@ -29,7 +38,15 @@ fast as possible.
 %autosetup -n ninja-%{version} -p1
 
 %build
-CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" \
+%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
@@ -37,37 +54,121 @@ CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" \
 %endif
   configure.py --bootstrap --verbose
 ./ninja -v all
+%if %{without bootstrap}
 ./ninja -v manual
+%endif
 
 %install
-# TODO: Install ninja_syntax.py?
 install -Dpm0755 ninja -t %{buildroot}%{_bindir}/
+%if %{without bootstrap}
 install -Dpm0644 misc/bash-completion %{buildroot}%{_datadir}/bash-completion/completions/ninja
 install -Dpm0644 misc/ninja-mode.el %{buildroot}%{_datadir}/emacs/site-lisp/ninja-mode.el
 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
-install -Dpm0644 %{S:2} %{buildroot}%{rpmmacrodir}/macros.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
+sed -i -e "/^%%__ninja /s| .*$| %{_bindir}/ninja|" %{buildroot}%{_rpmmacrodir}/macros.ninja
 
 ln -s ninja %{buildroot}%{_bindir}/ninja-build
 
+%if %{without bootstrap}
 %check
 ./ninja_test --gtest_filter=-SubprocessTest.SetWithLots
+%endif
 
 %files
 %license COPYING
-%doc HACKING.md README doc/manual.html
+%doc README.md
+%if %{without bootstrap}
+%doc doc/manual.html
+%endif
 %{_bindir}/ninja
 %{_bindir}/ninja-build
+%if %{without bootstrap}
 %{_datadir}/bash-completion/completions/ninja
 %{_datadir}/emacs/site-lisp/ninja-mode.el
 %{_datadir}/vim/vimfiles/syntax/ninja.vim
 %{_datadir}/vim/vimfiles/ftdetect/ninja.vim
 # zsh does not have a -filesystem package
 %{_datadir}/zsh/
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%pycached %{python2_sitelib}/ninja_syntax.py
+%else
+%pycached %{python3_sitelib}/ninja_syntax.py
+%endif
+%endif
 %{rpmmacrodir}/macros.ninja
 
 %changelog
+* 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
+
+* 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 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
+
+* Thu Jan 21 2021 Kalev Lember <klember@redhat.com> - 1.10.2-1
+- Update to 1.10.2
+
+* Wed Aug 19 2020 Björn Esser <besser82@fedoraproject.org> - 1.10.1-2
+- Add ninja_syntax.py
+
+* Wed Aug 19 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.10.1-1
+- Update to 1.10.1
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Feb 05 2020 Björn Esser <besser82@fedoraproject.org> - 1.10.0-1
+- Update to 1.10.0
+
+* Wed Feb 05 2020 Björn Esser <besser82@fedoraproject.org> - 1.9.0-5
+- Add conditional for bootstrapping new architectures
+- Use %%set_build_flags macro to export buildflags, if available
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 31 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.9.0-1
+- Update to 1.9.0
+
+* Thu Aug 16 2018 Owen Taylor <otaylor@redhat.com> - 1.8.2-5
+- Fix binddir usage in macros.ninja
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.8.2-3
+- Rebuilt for Python 3.7
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Tue Sep 12 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.8.2-1
 - Update to 1.8.2