ninja: Update to 1.11.1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/ninja/ninja.macro b/ninja/ninja.macro
deleted file mode 100644 (file)
index 8d2d0c7..0000000
--- a/ninja/ninja.macro
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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 ef54e5d9964cd2a47fb527d907e2aacf4e5cbbc5..d2caa7a6cece25aefc24797ba901f84185f60bdd 100644 (file)
--- a/ninja/ninja.nm
+++ b/ninja/ninja.nm
@@ -4,11 +4,11 @@
 ###############################################################################
 
 name       = ninja
-version    = 1.9.0
+version    = 1.11.1
 release    = 1
 
 groups     = Applications/System
-url        = http://martine.github.com/ninja/
+url        = https://ninja-build.org
 license    = ASL 2.0
 summary    = A small build system with a focus on speed
 
@@ -24,6 +24,7 @@ source_dl  = https://github.com/martine/ninja/archive/v%{version}/
 build
        requires
                asciidoc
+               python3
                python3-devel
        end
 
@@ -55,12 +56,6 @@ 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