[packages/rpm-pld-macros] Show hint to use _noautoreq_pear instead of _noautoreq. _noautoreq_pear avoids brackets escaping (o
arekm
arekm at pld-linux.org
Tue May 5 11:51:17 CEST 2026
commit 193a1614a38f4627e5d42e8a3cf3d7842a807f53
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue May 5 11:49:37 2026 +0200
Show hint to use _noautoreq_pear instead of _noautoreq. _noautoreq_pear avoids brackets escaping (or not escaping) mess
macros.php | 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 8766f5d..07861b6 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define rpm_macros_rev 2.062
+%define rpm_macros_rev 2.063
%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.php b/macros.php
index b44af38..af7c77f 100644
--- a/macros.php
+++ b/macros.php
@@ -112,7 +112,7 @@ tee install.log \
# make post message of optional packages \
grep -E 'can optionally use|Optional feature' install.log | sed -e 's,package "pear/,package "php-pear-,g;s,^pear/,php-pear-,;s,^pear/,php-pear-,' > optional-packages.txt \
if [ -s optional-packages.txt ]; then \
- awk -F'"' '/use package/{print $2}' optional-packages.txt | sed -e "s,_,/,g;s,php-pear-, 'pear(,;s,$,.*)'," | tr -d '\\\n' > _noautoreq \
+ awk -F'"' '/use package/{print $2}' optional-packages.txt | sed -e "s,_,/,g;s,php-pear-, ,;s,$,.*," | tr -d '\\\n' > _noautoreq \
else \
rm -f optional-packages.txt \
fi \
@@ -172,7 +172,7 @@ find $RPM_BUILD_ROOT%{php_pear_dir} '(' -name '*~' -o -name '*.orig' ')' | xargs
# help the developer out a little: \
if [ -f _noautoreq ]; then \
echo "AutoReqdep detected:" \
- echo "_noautoreq $(cat _noautoreq)" \
+ echo "_noautoreq_pear$(cat _noautoreq)" \
fi \
%{nil}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/193a1614a38f4627e5d42e8a3cf3d7842a807f53
More information about the pld-cvs-commit
mailing list