diff --git a/ninja-build.spec b/ninja-build.spec index 5c4cb18..e21b669 100644 --- a/ninja-build.spec +++ b/ninja-build.spec @@ -4,7 +4,7 @@ Name: ninja-build Version: 1.10.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Small build system with a focus on speed License: ASL 2.0 URL: https://ninja-build.org/ @@ -12,11 +12,7 @@ Source0: https://github.com/ninja-build/ninja/archive/v%{version}/ninja-% 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 @@ -46,12 +42,7 @@ 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 +%python3 configure.py --bootstrap --verbose ./ninja -v all %if %{without bootstrap} ./ninja -v manual @@ -65,12 +56,8 @@ 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 @@ -97,16 +84,17 @@ 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 -%{_datadir}/zsh/ -%if 0%{?rhel} && 0%{?rhel} <= 7 -%pycached %{python2_sitelib}/ninja_syntax.py -%else +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions +%{_datadir}zsh/site-functions/_ninja %pycached %{python3_sitelib}/ninja_syntax.py %endif -%endif -%{rpmmacrodir}/macros.ninja +%{_rpmmacrodir}/macros.ninja %changelog +* Fri Mar 05 2021 Igor Raits - 1.10.2-3 +- Cleanup from unneeded conditions + * Tue Jan 26 2021 Fedora Release Engineering - 1.10.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild