deprecate meson_* macros with ninja_*

see http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2018-October/025633.html

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 90b0fefbf51f74a27dd7c4988b559bb5bb2979e5..16d70dd3c759a418bdcf359c4f0545b18846db9d 100644 (file)
--- 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 94457fe40da3e150f3141c6210ba3d5b2ba9e930..2982f342e4a814947cc6a119ebc6c91a5b81e596 100644 (file)
--- 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