commit 0975920b549daec7d00df5c7d8ad161cde39b846
Author: Jan Rękorajski <[email protected]>
Date: Fri Apr 8 10:08:38 2022 +0200
- rpm4 needs --whatprovides to resolve virtual required deps
macros.pld | 4 ++--
rpm-pld-macros.spec | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 94ec16c..b29d58d 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define rpm_macros_rev 2.013
+%define rpm_macros_rev 2.014
%define find_lang_rev 1.40
# 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 377d6d5..abe4fa3 100644
--- a/macros.pld
+++ b/macros.pld
@@ -689,12 +689,12 @@ LC_ALL=C.UTF-8 %{__meson} \
# Requires: name = version
%requires_eq()
%{!?1:ERROR}%{?2:ERROR}%{?1:%{!?2:%{expand:%%requires_eq_to %1 %1}}}
# Requires: name = version (version based on querying package %2)
-%requires_eq_to(r) %{!?2:ERROR}%{?3:ERROR}%{?2:%{!?3:%(if ! LC_ALL=C rpm
-q --qf 'Requires: %1 = %|E?{%{E}:}|%{V}%{?-r:-%{R}}\\n' %2 | grep
'^Requires:'; then echo "BuildRequires: %2"; fi)}}
+%requires_eq_to(r) %{!?2:ERROR}%{?3:ERROR}%{?2:%{!?3:%(if ! LC_ALL=C rpm
-q --whatprovides --qf 'Requires: %1 = %|E?{%{E}:}|%{V}%{?-r:-%{R}}\\n' %2 |
grep '^Requires:'; then echo "BuildRequires: %2"; fi)}}
# Requires: name >= version
%requires_ge()
%{!?1:ERROR}%{?2:ERROR}%{?1:%{!?2:%{expand:%%requires_ge_to %1 %1}}}
# Requires: name >= version (version based on querying package %2)
-%requires_ge_to(r) %{!?2:ERROR}%{?3:ERROR}%{?2:%{!?3:%(if ! LC_ALL=C rpm
-q --qf 'Requires: %1 >= %|E?{%{E}:}|%{V}%{?-r:-%{R}}\\n' %2 | grep
'^Requires:'; then echo "BuildRequires: %2"; fi)}}
+%requires_ge_to(r) %{!?2:ERROR}%{?3:ERROR}%{?2:%{!?3:%(if ! LC_ALL=C rpm
-q --whatprovides --qf 'Requires: %1 >= %|E?{%{E}:}|%{V}%{?-r:-%{R}}\\n' %2 |
grep '^Requires:'; then echo "BuildRequires: %2"; fi)}}
# helper for renaming packages
# %rename old-package
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/0975920b549daec7d00df5c7d8ad161cde39b846
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
