From c44c2e3f9015cbf0d49c66db9d393fb3dc9cd253 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Tue, 17 Jun 2025 13:48:01 +0800 Subject: [PATCH] move perl relative macros into macros.perl --- macros | 8 -------- macros.perl | 12 +++++++++++- openEuler-rpm-config.spec | 5 ++++- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/macros b/macros index c6ec92e..18fb73b 100644 --- a/macros +++ b/macros @@ -498,12 +498,4 @@ Man pages and other related documents for %{name}. %install_info_rm() \ /sbin/install-info --remove %1 %{_infodir}/dir || : -# macros that used for perl -%__perl /usr/bin/perl %requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%perl_sitearch %(eval "`%{__perl} -V:installsitearch`"; echo $installsitearch) -%perl_sitelib %(eval "`%{__perl} -V:installsitelib`"; echo $installsitelib) -%perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch) -%perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib) -%perl_archlib %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib) -%perl_privlib %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib) diff --git a/macros.perl b/macros.perl index cab2eb7..6aaecaf 100644 --- a/macros.perl +++ b/macros.perl @@ -22,6 +22,16 @@ export PERL_AUTOINSTALL="--defaultdeps" export PERL_MM_USE_DEFAULT=1 } +############################################################################# +# Perl specific macros, no longer part of rpm >= 4.15 +%__perl %{_bindir}/perl +%perl_sitearch %(eval "`%{__perl} -V:installsitearch`"; echo $installsitearch) +%perl_sitelib %(eval "`%{__perl} -V:installsitelib`"; echo $installsitelib) +%perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch) +%perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib) +%perl_archlib %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib) +%perl_privlib %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib) + ############################################################################# # Filtering macro incantations @@ -31,7 +41,7 @@ export PERL_MM_USE_DEFAULT=1 %perl_default_filter_revision 3 # By default, for perl packages we want to filter all files in _docdir from -# req/prov scanning, except META.json/yml for scanning requirements. +# req/prov scanning. # Filtering out any provides caused by private libs in vendorarch/archlib # (vendor/core) is done by rpmbuild since Fedora 20 # . diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 3a86d83..f5816a0 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 31 -Release: 28 +Release: 29 License: GPL+ AND MIT Summary: specific rpm configuration files URL: https://gitee.com/src-openeuler/openEuler-rpm-config @@ -212,6 +212,9 @@ sed -i "s|@OSCPE@|$(cat /etc/system-release-cpe)|" %{buildroot}%{rpmvdir}/%{vend %{rpmvdir}/find-requires.ksyms %changelog +* Tue Jun 17 2025 Funda Wang - 31-29 +- move perl relative macros into macros.perl + * Wed Jun 04 2025 Dongxing Wang - 31-28 - Add macros.build-constraints %%limit_build(m) -- Gitee