From 710d3b304383bf4165c0673b31759c30ee554600 Mon Sep 17 00:00:00 2001 From: openeuler-basic Date: Tue, 14 Jan 2020 19:14:36 +0800 Subject: [PATCH] update macros --- generic-rpm-config.spec | 8 +++++++- macros | 10 ++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/generic-rpm-config.spec b/generic-rpm-config.spec index ef98bea..7e548f6 100644 --- a/generic-rpm-config.spec +++ b/generic-rpm-config.spec @@ -2,7 +2,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 5 +Release: 6 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/src-openeuler/openEuler-rpm-config @@ -104,6 +104,12 @@ mkdir -p %{buildroot}%{_fileattrsdir} %{_rpmconfigdir}/macros.d/* %changelog +* Tue Jan 14 2020 openEuler Buildteam - 30-6 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:update macros file + * Tue Jan 14 2020 openEuler Buildteam - 30-5 - Type:enhancement - ID:NA diff --git a/macros b/macros index 9ec8476..7ebe487 100644 --- a/macros +++ b/macros @@ -292,3 +292,13 @@ 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) -- Gitee