ninja: Update to 1.9.0

* Also add macro file for pakfire.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/ninja/ninja.macro b/ninja/ninja.macro
new file mode 100644 (file)
index 0000000..8d2d0c7
--- /dev/null
+++ b/ninja/ninja.macro
@@ -0,0 +1,21 @@
+#
+# ninja-build macros
+#
+
+
+__ninja = %{bindir}/ninja
+__ninja_common_opts = -v %{PARALLELISMFLAGS}
+
+ninja_build = \
+       %{__ninja} \
+       %{__ninja_common_opts}
+
+ninja_install = \
+       DESTDIR=%{BUILDROOT} \
+       %{__ninja} install \
+       %{__ninja_common_opts}
+
+ninja_test = \
+       %{__ninja} test \
+       %{__ninja_common_opts}
+

diff --git a/ninja/ninja.nm b/ninja/ninja.nm
index e0793d8a05d16e29f4c709e895da78ee07f512db..ef54e5d9964cd2a47fb527d907e2aacf4e5cbbc5 100644 (file)
--- a/ninja/ninja.nm
+++ b/ninja/ninja.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = ninja
-version    = 1.8.2
+version    = 1.9.0
 release    = 1
 
 groups     = Applications/System
@@ -55,6 +55,12 @@ build
 
                # Install ninja syntax highlighting for vim.
                install -Dpm0644 misc/ninja.vim %{BUILDROOT}%{datadir}/vim/vimfiles/syntax/ninja.vim
+
+               # Install pakfire macro.
+               mkdir -p %{BUILDROOT}/usr/lib/pakfire/macros
+               install -v -m 644 %{DIR_SOURCE}/%{name}.macro \
+                       %{BUILDROOT}/usr/lib/pakfire/macros
+
        end
 end