From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCHv2] ninja: Update to 1.9.0
Date: Fri, 21 Jun 2019 13:29:50 +0200
Message-ID: <20190621112950.18542-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3937041939805480643=="
List-Id: <development.lists.ipfire.org>

--===============3937041939805480643==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

* Also add macro file for pakfire.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 ninja/ninja.macro | 21 +++++++++++++++++++++
 ninja/ninja.nm    |  8 +++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 ninja/ninja.macro

diff --git a/ninja/ninja.macro b/ninja/ninja.macro
new file mode 100644
index 000000000..8d2d0c75c
--- /dev/null
+++ b/ninja/ninja.macro
@@ -0,0 +1,21 @@
+#
+# ninja-build macros
+#
+
+
+__ninja =3D %{bindir}/ninja
+__ninja_common_opts =3D -v %{PARALLELISMFLAGS}
+
+ninja_build =3D \
+	%{__ninja} \
+	%{__ninja_common_opts}
+
+ninja_install =3D \
+	DESTDIR=3D%{BUILDROOT} \
+	%{__ninja} install \
+	%{__ninja_common_opts}
+
+ninja_test =3D \
+	%{__ninja} test \
+	%{__ninja_common_opts}
+
diff --git a/ninja/ninja.nm b/ninja/ninja.nm
index e0793d8a0..ef54e5d99 100644
--- a/ninja/ninja.nm
+++ b/ninja/ninja.nm
@@ -4,7 +4,7 @@
 ############################################################################=
###
=20
 name       =3D ninja
-version    =3D 1.8.2
+version    =3D 1.9.0
 release    =3D 1
=20
 groups     =3D Applications/System
@@ -55,6 +55,12 @@ build
=20
 		# 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
=20
--=20
2.20.1


--===============3937041939805480643==--