rpms/ninja-build
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix binddir usage in macros.ninja

Browse Source 
The installed macros file should reference the binddir of this package, not the
binddir of the package being built.
This commit is contained in:
Owen W. Taylor 2018-03-06 14:02:37 -05:00
parent e1503714b8
commit cf77b51fa6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ninja-build.spec
View File

@ -1,6 +1,6 @@
Name: ninja-build Name: ninja-build
Version: 1.8.2 Version: 1.8.2
Release: 4%{?dist} Release: 5%{?dist}
Summary: A small build system with a focus on speed Summary: A small build system with a focus on speed
License: ASL 2.0 License: ASL 2.0
URL: http://martine.github.com/ninja/ 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 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja
install -Dpm0644 %{S:2} %{buildroot}%{rpmmacrodir}/macros.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 ln -s ninja %{buildroot}%{_bindir}/ninja-build
%check %check
@ -68,6 +71,9 @@ ln -s ninja %{buildroot}%{_bindir}/ninja-build
%{rpmmacrodir}/macros.ninja %{rpmmacrodir}/macros.ninja
%changelog %changelog
* 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 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild