From af643e75cd1d6c23ca044c83f6ad0b4d7fc434a3 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:06:34 +0100 Subject: [PATCH] fix rpm-macros patch to pass DESTDIR in meson_install [release 0.47.1-2mamba;Mon Aug 13 2018] --- ...0.45.1-rpm-macros.path => meson-0.47.1-rpm-macros.patch | 3 ++- meson.spec | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) rename meson-0.45.1-rpm-macros.path => meson-0.47.1-rpm-macros.patch (96%) diff --git a/meson-0.45.1-rpm-macros.path b/meson-0.47.1-rpm-macros.patch similarity index 96% rename from meson-0.45.1-rpm-macros.path rename to meson-0.47.1-rpm-macros.patch index 9be3d81..9a31be3 100644 --- a/meson-0.45.1-rpm-macros.path +++ b/meson-0.47.1-rpm-macros.patch @@ -18,7 +18,7 @@ diff -Nru meson-0.45.1.orig/data/macros.meson meson-0.45.1/data/macros.meson %{__meson} \\\ --buildtype=plain \\\ --prefix=%{_prefix} \\\ -@@ -23,17 +23,17 @@ +@@ -23,17 +23,18 @@ --localstatedir=%{_localstatedir} \\\ --sharedstatedir=%{_sharedstatedir} \\\ --wrap-mode=%{__meson_wrap_mode} \\\ @@ -32,6 +32,7 @@ diff -Nru meson-0.45.1.orig/data/macros.meson meson-0.45.1/data/macros.meson %meson_install \ - %ninja_install -C %{_vpath_builddir} ++ export DESTDIR="%{buildroot}" \ + ninja install -C build %meson_test \ diff --git a/meson.spec b/meson.spec index d860b0a..c6d7fb9 100644 --- a/meson.spec +++ b/meson.spec @@ -1,6 +1,6 @@ Name: meson Version: 0.47.1 -Release: 1mamba +Release: 2mamba Summary: The Meson Build System Group: Development/Tools Vendor: openmamba @@ -9,7 +9,7 @@ Packager: Silvan Calarco URL: http://mesonbuild.com/ ## GITSOURCE https://github.com/mesonbuild/meson.git 0.43.0 Source: https://github.com/mesonbuild/meson.git/%{version}/meson-%{version}.tar.bz2 -Patch0: meson-0.45.1-rpm-macros.path +Patch0: meson-0.47.1-rpm-macros.patch License: Apache License 2.0 ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END @@ -56,6 +56,9 @@ install -D -m0644 data/macros.meson %{buildroot}%{_sysconfdir}/rpm/macros.meson %doc COPYING %changelog +* Mon Aug 13 2018 Silvan Calarco 0.47.1-2mamba +- fix rpm-macros patch to pass DESTDIR in meson_install + * Thu Jul 12 2018 Automatic Build System 0.47.1-1mamba - automatic version update by autodist