diff --git a/macros b/macros index 3fe9244..156ee66 100644 --- a/macros +++ b/macros @@ -263,3 +263,14 @@ print(result) %global __find_provides /bin/sh -c "%{?__filter_prov_cmd} %{__deploop P} %{?__filter_from_prov}" \ %global __find_requires /bin/sh -c "%{?__filter_req_cmd} %{__deploop R} %{?__filter_from_req}" \ } + +# Temporary shelter for rpm 4.15 refugees +%__perl %{_bindir}/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/redhat-rpm-config.spec b/redhat-rpm-config.spec index aabc3cf..44257ad 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 130 +Version: 131 Release: 1%{?dist} # No version specified. License: GPL+ @@ -202,6 +202,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Mon Jun 10 2019 Panu Matilainen - 131-1 +- Provide temporary shelter for rpm 4.15 perl macro refugees + * Tue Jun 04 2019 Igor Gnatenko - 130-1 - New macro for wrapping text — %%wordwrap - Smal fix for %%listfiles with no arguments