[packages/rpm-build-macros] deprecate meson_* macros with ninja_*
glen
glen at pld-linux.org
Thu Nov 1 16:50:07 CET 2018
commit 003c1a6e32c4cf2d63774263a31d21834f1b25d2
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Thu Nov 1 17:49:30 2018 +0200
deprecate meson_* macros with ninja_*
see http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2018-October/025633.html
rpm-build-macros.spec | 2 +-
rpm.macros | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 90b0fef..16d70dd 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define rpm_macros_rev 1.735
+%define rpm_macros_rev 1.736
%define find_lang_rev 1.40
Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros b/rpm.macros
index 94457fe..2982f34 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -349,14 +349,16 @@ LC_ALL=C.UTF-8 %{__meson} \
--wrap-mode=%{__meson_wrap_mode} \
--default-library='both' \
}
-%meson_build LC_ALL=C.UTF-8 %ninja_build
-%meson_install LC_ALL=C.UTF-8 %ninja_install
-%meson_test LC_ALL=C.UTF-8 %ninja_test
+
+%___meson_deprecate() {echo >&2 "DEPRECATED: %%%1 must be replaced with %%%2"; %{expand:%%%2} }
+%meson_build %___meson_deprecate meson_build ninja_build
+%meson_install %___meson_deprecate meson_install ninja_install
+%meson_test %___meson_deprecate meson_test ninja_test
# ninja
-%ninja_build %{__ninja} %{__ninja_common_opts}
-%ninja_install DESTDIR=%{buildroot} %{__ninja} install %{__ninja_common_opts}
-%ninja_test %{__ninja} test %{__ninja_common_opts}
+%ninja_build LC_ALL=C.UTF-8 %{__ninja} %{__ninja_common_opts}
+%ninja_install LC_ALL=C.UTF-8 DESTDIR=%{buildroot} %{__ninja} install %{__ninja_common_opts}
+%ninja_test LC_ALL=C.UTF-8 %{__ninja} test %{__ninja_common_opts}
#----------------------------------------------------------------
#%configure_cache 0
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/003c1a6e32c4cf2d63774263a31d21834f1b25d2
More information about the pld-cvs-commit
mailing list