[packages/rpm-pld-macros] - ensure not using meson and ninja without macros packaged; version 2.042

qboosh qboosh at pld-linux.org
Wed Feb 5 19:46:57 CET 2025


commit dc04d819a7763a9d7db5d856426f94792faa6a39
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Feb 5 19:30:23 2025 +0100

    - ensure not using meson and ninja without macros packaged; version 2.042

 rpm-pld-macros.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 9b22503..7db5e76 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	2.041
+%define		rpm_macros_rev	2.042
 %define		find_lang_rev	1.42
 # split into individual X_prov_ver if there is a reason to desync
 %define		prov_ver	4.15
@@ -91,6 +91,10 @@ Provides:	rpmbuild(macros) = %{rpm_macros_rev}
 Requires:	rpm-macros-systemd
 Obsoletes:	rpm-build-macros < 1.745
 Conflicts:	gettext-devel < 0.11
+# ensure not using meson without meson-related macros in package
+Conflicts:	meson < 1.6.1-3
+# ensure not using ninja without ninja-related macros in package
+Conflicts:	ninja < 1.12.1-2
 # macros.d/*
 Conflicts:	rpm-build < 5.4.15-52
 # php-config --sysconfdir
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list