diff --git a/.gitignore b/.gitignore index 7c48ffa..2e3e189 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ninja-1.8.2.tar.gz +SOURCES/ninja-1.10.2.tar.gz diff --git a/.ninja-build.metadata b/.ninja-build.metadata index 2dee138..f001746 100644 --- a/.ninja-build.metadata +++ b/.ninja-build.metadata @@ -1 +1 @@ -17219deb34dd816363e37470f77ff7231509143a SOURCES/ninja-1.8.2.tar.gz +8d2e8c1c070c27fb9dc46b4a6345bbb1de7ccbaf SOURCES/ninja-1.10.2.tar.gz diff --git a/SPECS/ninja-build.spec b/SPECS/ninja-build.spec index 067154d..da312f4 100644 --- a/SPECS/ninja-build.spec +++ b/SPECS/ninja-build.spec @@ -1,23 +1,27 @@ +# Set to bcond_without or use --with bootstrap, +# when bootstrapping a new architecture. +%bcond_with bootstrap + Name: ninja-build -Version: 1.8.2 -Release: 1%{?dist} -Summary: A small build system with a focus on speed +Version: 1.10.2 +Release: 3%{?dist} +Summary: Small build system with a focus on speed License: ASL 2.0 -URL: http://martine.github.com/ninja/ -Source0: https://github.com/martine/ninja/archive/v%{version}/ninja-%{version}.tar.gz +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 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 BuildRequires: re2c >= 0.11.3 +%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,154 +33,57 @@ fast as possible. %autosetup -n ninja-%{version} -p1 %build -CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" \ -%if 0%{?rhel} && 0%{?rhel} <= 7 -%{__python2} \ -%else -%{__python3} \ -%endif - configure.py --bootstrap --verbose +%set_build_flags +%python3 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 +install -Dpm0644 misc/ninja_syntax.py %{buildroot}%{python3_sitelib}/ninja_syntax.py +%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/ -%{rpmmacrodir}/macros.ninja +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/_ninja +%pycached %{python3_sitelib}/ninja_syntax.py +%endif +%{_rpmmacrodir}/macros.ninja %changelog -* Tue Sep 12 2017 Igor Gnatenko - 1.8.2-1 -- Update to 1.8.2 - -* Thu Sep 07 2017 Igor Gnatenko - 1.8.1-1 -- Update to 1.8.1 - -* Sat Sep 02 2017 Igor Gnatenko - 1.8.0-1 -- Update to 1.8.0 - -* Tue Aug 01 2017 Kalev Lember - 1.7.2-6 -- Backport an upstream patch to handle ostree setting 0 mtime - -* Wed Jul 26 2017 Fedora Release Engineering - 1.7.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Apr 21 2017 Zbigniew Jędrzejewski-Szmek - 1.7.2-4 -- Rename main executable to ninja (#1166135) - (compatibility symlink is added) - -* Fri Feb 10 2017 Fedora Release Engineering - 1.7.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Dec 03 2016 Igor Gnatenko - 1.7.2-2 -- Add EPEL hacks - -* Mon Nov 28 2016 Igor Gnatenko - 1.7.2-1 -- Update to 1.7.2 - -* Mon Oct 10 2016 Igor Gnatenko - 1.7.1-3 -- Fix install ninja.vim - -* Sat Oct 08 2016 Igor Gnatenko - 1.7.1-2 -- Add RPM macro - -* Sat Jul 23 2016 Ben Boeckel - 1.7.1-1 -- update to 1.7.1 -- fix bash completion for the binary rename (#1352330) -- disable test which fails to koji rlimit settings - -* Thu Feb 04 2016 Fedora Release Engineering - 1.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Nov 16 2015 Ben Boeckel - 1.6.0-2 -- Add patch to rename mentions of the binary name - -* Sun Jul 19 2015 Ben Boeckel - 1.6.0-1 -- Update to 1.6.0 - -* Wed Jun 17 2015 Fedora Release Engineering - 1.5.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 1.5.3-3 -- Rebuilt for GCC 5 C++11 ABI change - -* Sun Feb 08 2015 Ben Boeckel - 1.5.3-2 -- Update bash-completions location - -* Wed Dec 10 2014 Ben Boeckel - 1.5.3-1 -- Update to 1.5.3 - -* Sun Aug 17 2014 Fedora Release Engineering - 1.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Tue Aug 05 2014 Christopher Meng - 1.5.1-1 -- Update to 1.5.1 - -* Sat Jun 07 2014 Fedora Release Engineering - 1.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Nov 20 2013 Ben Boeckel - 1.4.0-1 -- Update to 1.4.0 - -* Sun Nov 3 2013 Ville Skyttä - 1.3.4-4 -- Use special %%doc to install all docs (#994005). - -* Sat Aug 03 2013 Fedora Release Engineering - 1.3.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Jun 21 2013 Dan Horák - 1.3.4-2 -- workaround possible too low limits for number of processes and open files, - fixes build on ppc/ppc64 and s390(x) - -* Sun Jun 09 2013 Ben Boeckel - 1.3.4-1 -- Update to 1.3.4 -- Run test suite - -* Thu Feb 14 2013 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Nov 04 2012 Ben Boeckel - 1.0.0-1 -- Update to 1.0.0 - -* Thu Jul 19 2012 Ben Boeckel - 0-0.6.20120719git5dc55a3 -- Update to new snapshot - -* Mon Jul 09 2012 Ben Boeckel - 0-0.5.20120709gitb90d038 -- Preserve timestamps on install -- Install as ninja-build to avoid conflicts with the ninja IRC package -- Update snapshot - -* Tue Jun 19 2012 Ben Boeckel - 0-0.4.20120605git54553d3 -- Add an ftdetect file for ninja -- Fix zsh-stuff directory ownership - -* Thu Jun 07 2012 Ben Boeckel - 0-0.3.20120605git54553d3 -- Add a Group tag - -* Tue Jun 05 2012 Ben Boeckel - 0-0.2.20120605git54553d3 -- Update to new snapshot +* Fri Mar 05 2021 Igor Raits - 1.10.2-3 +- import ninja-build-1.10.2-3.fc35 -* Fri Mar 30 2012 Ben Boeckel - 0-0.1.20120330gitabd33d5 -- Initial package