From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] meson: Update to 0.50.1
Date: Fri, 21 Jun 2019 13:31:23 +0200
Message-ID: <20190621113123.18666-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0227861073891388496=="
List-Id: <development.lists.ipfire.org>

--===============0227861073891388496==
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>
---
 meson/meson.macro | 42 ++++++++++++++++++++++++++++++++++++++++++
 meson/meson.nm    |  8 +++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 meson/meson.macro

diff --git a/meson/meson.macro b/meson/meson.macro
new file mode 100644
index 000000000..f26c7af21
--- /dev/null
+++ b/meson/meson.macro
@@ -0,0 +1,42 @@
+#
+# Meson macros
+#
+
+
+__meson =3D %{bindir}/meson
+__meson_wrap_mode =3D nodownload
+__meson_auto_features =3D enabled
+
+_smp_mesonflags =3D %{PARALLELISMFLAGS}
+
+meson =3D \
+    %{__meson} \
+	--buildtype=3Dplain \
+	--prefix=3D%{prefix} \
+	--libdir=3D%{libdir} \
+	--libexecdir=3D%{libexecdir} \
+	--bindir=3D%{bindir} \
+	--sbindir=3D%{sbindir} \
+	--includedir=3D%{includedir} \
+	--datadir=3D%{datadir} \
+	--mandir=3D%{mandir} \
+	--infodir=3D%{infodir} \
+	--localedir=3D%{datadir}/locale \
+	--sysconfdir=3D%{sysconfdir} \
+	--localstatedir=3D%{localstatedir} \
+	--sharedstatedir=3D%{sharedstatedir} \
+	--wrap-mode=3D%{__meson_wrap_mode} \
+	--auto-features=3D%{__meson_auto_features} \
+        . %{DISTRO_MACHINE}
+
+meson_build =3D \
+	%{ninja_build} -C %{DISTRO_MACHINE}
+
+meson_install =3D \
+	%{ninja_install} -C %{DISTRO_MACHINE}
+
+meson_test =3D \
+    %{__meson} test \
+	-C %{DISTRO_MACHINE} \
+	%{PARALLELISMFLAGS} \
+	--print-errorlogs
diff --git a/meson/meson.nm b/meson/meson.nm
index 208966a79..b7a687155 100644
--- a/meson/meson.nm
+++ b/meson/meson.nm
@@ -4,7 +4,7 @@
 ############################################################################=
###
=20
 name       =3D meson
-version    =3D 0.48.1
+version    =3D 0.50.1
 release    =3D 1
 arch	   =3D noarch
=20
@@ -40,12 +40,18 @@ build
=20
 	install
 		%{python3} setup.py install -O1 --skip-build --root %{BUILDROOT}
+
+		# 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
 packages
 	package %{name}
 		requires
+			ninja-build >=3D 1.9.0
 			python3-setuptools
 		end
 	end
--=20
2.20.1


--===============0227861073891388496==--