[packages/rpm-pld-macros] - drop ninja macros and stop wrapping ninja in meson - meson and ninja macros are provided by respec

baggins baggins at pld-linux.org
Mon Feb 3 10:23:05 CET 2025


commit 5a1382d74f1e02fb88b27451b2d0ada65c86d893
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Feb 3 10:12:27 2025 +0100

    - drop ninja macros and stop wrapping ninja in meson
    - meson and ninja macros are provided by respective packages now
    - bump version to 2.037

 macros.pld          | 12 ------------
 rpm-pld-macros.spec |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 60e44a4..78384bd 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	2.036
+%define		rpm_macros_rev	2.037
 %define		find_lang_rev	1.42
 # split into individual X_prov_ver if there is a reason to desync
 %define		prov_ver	4.15
diff --git a/macros.pld b/macros.pld
index f0449b0..4c0b0e7 100644
--- a/macros.pld
+++ b/macros.pld
@@ -257,8 +257,6 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 %__cmake	/usr/bin/cmake
 %__meson	/usr/bin/meson
 %__meson_wrap_mode	nodownload
-%__ninja	/usr/bin/ninja
-%__ninja_common_opts	-v %{?_smp_mflags}
 
 %__gettextize(d:) { \
 	gettextize --copy --force --no-changelog %{?-d:--po-dir='%{-d*}'}; \
@@ -584,16 +582,6 @@ LC_ALL=C.UTF-8 %{__meson} \
 	--default-library='both' \
 }
 
-%___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 (since 1.736)
-%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
 %configure_cache_file	%{buildroot}.configure.cache
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/5a1382d74f1e02fb88b27451b2d0ada65c86d893



More information about the pld-cvs-commit mailing list