From cf77b51fa6e2e6d031cd7a11249b1fdf3b9adc73 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Tue, 6 Mar 2018 14:02:37 -0500 Subject: [PATCH] Fix binddir usage in macros.ninja The installed macros file should reference the binddir of this package, not the binddir of the package being built. --- ninja-build.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ninja-build.spec b/ninja-build.spec index 87283b7..db14e05 100644 --- a/ninja-build.spec +++ b/ninja-build.spec @@ -1,6 +1,6 @@ Name: ninja-build Version: 1.8.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A small build system with a focus on speed License: ASL 2.0 URL: http://martine.github.com/ninja/ @@ -49,6 +49,9 @@ 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 +# 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 %check @@ -68,6 +71,9 @@ ln -s ninja %{buildroot}%{_bindir}/ninja-build %{rpmmacrodir}/macros.ninja %changelog +* Thu Aug 16 2018 Owen Taylor - 1.8.2-5 +- Fix binddir usage in macros.ninja + * Fri Jul 13 2018 Fedora Release Engineering - 1.8.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild