|
From: Gleb C. <lna...@ya...> - 2023-04-24 14:54:06
|
Commit: bef30fd GitHub URL: https://github.com/SCST-project/scst/commit/bef30fd6d039db9e001d3c4ae694d95d52aee70e Author: Gleb Chesnokov Date: 2023-04-24T17:53:34+03:00 Log Message: ----------- scstadmin.spec: Fix RPM build errors This patch fixes RPM build errors caused by incorrect file paths: RPM build errors: File must begin with "/": %{perl_vendorlib}/SCST File must begin with "/": %{perl_vendorarch}/auto/SCST_SCST For some reasons, the perl_vendorlib and perl_vendorarch variables may not be defined by default on newer RHEL systems. Therefore, assign the variables explicitly to avoid these errors. Modified Paths: -------------- scstadmin/scstadmin.spec.in | 29 +++++++++------ 1 file changed, 17 insertions(+), 12 deletions(-) =================================================================== diff --git a/scstadmin/scstadmin.spec.in b/scstadmin/scstadmin.spec.in index 086aa6f..853c063 100644 --- a/scstadmin/scstadmin.spec.in +++ b/scstadmin/scstadmin.spec.in @@ -1,5 +1,8 @@ %define rpm_version @rpm_version@ %define make %{expand:%%(echo ${MAKE:-make})} +%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib) +%define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch) +%define perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib) Name: scstadmin Version: %{rpm_version} @@ -26,19 +29,21 @@ Authors: -------- Mark R. Buechler, Bart Van Assche and others -%define scstadmin_perl_installvendorman3dir \ +%define scstadmin_perl_installvendorman3dir \ %(perl -V:installvendorman3dir | sed "s|.*='||;s|'.*||") -%define scstadmin_perl_process_packlist \ -set -x;\ -if test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto; then \ - find $RPM_BUILD_ROOT%perl_vendorarch/auto -name .packlist -print0 | \ - xargs -0 -r rm; \ - if [ %{_target_cpu} == noarch ]; then \ - find $RPM_BUILD_ROOT%perl_vendorarch/auto -depth -type d -print0 | \ - xargs -0 -r rmdir; \ - fi; \ - fi; \ - rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod; set +x + +%define scstadmin_perl_process_packlist \ +set -x; \ +if test -n "$RPM_BUILD_ROOT" -a -d $RPM_BUILD_ROOT%perl_vendorarch/auto; then \ + find $RPM_BUILD_ROOT%perl_vendorarch/auto -name .packlist -print0 | \ + xargs -0 -r rm; \ + if [ %{_target_cpu} == noarch ]; then \ + find $RPM_BUILD_ROOT%perl_vendorarch/auto -depth -type d -print0 | \ + xargs -0 -r rmdir; \ + fi; \ +fi; \ +rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod; \ +set +x %global debug_package %{nil} |