SHA256
1
0
forked from pool/ninja

Accepting request 444304 from home:badshah400:branches:devel:tools:building

Added macros.ninja as external source and install it to rpmconfigdir. This installs macros for RPM which are then used by meson (since v0.36) [The macros file comes from Fedora, allowing to easy manage x-distro packages]

OBS-URL: https://build.opensuse.org/request/show/444304
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ninja?expand=0&rev=32
This commit is contained in:
Ismail Dönmez 2016-12-06 15:06:14 +00:00 committed by Git OBS Bridge
parent 94dd2c0e8d
commit 041a072ab1
3 changed files with 22 additions and 0 deletions

12
macros.ninja Normal file
View File

@ -0,0 +1,12 @@
%__ninja %{_bindir}/ninja
%__ninja_common_opts -v %{?_smp_mflags}
%ninja_build \
%{__ninja} %{__ninja_common_opts}
%ninja_install \
DESTDIR=%{buildroot} %{__ninja} install %{__ninja_common_opts}
%ninja_test \
%{__ninja} test %{__ninja_common_opts}

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Dec 6 14:07:36 UTC 2016 - badshah400@gmail.com
- Add macros.ninja as an external source file and install it to
the %{_rpmconfigdir}/macros.d/; this installs macros for RPM
that are in turn used by the RPM macros for meson.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Nov 13 11:08:00 UTC 2016 - mpluskal@suse.com Sun Nov 13 11:08:00 UTC 2016 - mpluskal@suse.com

View File

@ -24,6 +24,7 @@ License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Url: https://ninja-build.org/ Url: https://ninja-build.org/
Source0: https://github.com/ninja-build/ninja/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source0: https://github.com/ninja-build/ninja/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: macros.ninja
Patch1: ninja-disable-maxprocs-test.patch Patch1: ninja-disable-maxprocs-test.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%if 0%{?suse_version} <= 1110 %if 0%{?suse_version} <= 1110
@ -57,6 +58,7 @@ install -D -p -m 0755 ninja %{buildroot}%{_bindir}/ninja
install -D -p -m 0644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja install -D -p -m 0644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja
install -D -p -m 0644 misc/ninja.vim %{buildroot}%{_datadir}/vim/site/syntax/ninja.vim install -D -p -m 0644 misc/ninja.vim %{buildroot}%{_datadir}/vim/site/syntax/ninja.vim
install -D -p -m 0644 misc/bash-completion %{buildroot}%{_sysconfdir}/bash_completion.d/ninja install -D -p -m 0644 misc/bash-completion %{buildroot}%{_sysconfdir}/bash_completion.d/ninja
install -D -p -m 0644 %{S:1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.ninja
%check %check
./ninja ninja_test ./ninja ninja_test
@ -69,5 +71,6 @@ install -D -p -m 0644 misc/bash-completion %{buildroot}%{_sysconfdir}/bash_compl
%{_datadir}/zsh %{_datadir}/zsh
%{_datadir}/vim %{_datadir}/vim
%{_sysconfdir}/bash_completion.d %{_sysconfdir}/bash_completion.d
%{_rpmconfigdir}/macros.d/macros.ninja
%changelog %changelog