From 5a45066610be995c01cf44ad98ffef80b404b0f2 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Thu, 24 Sep 2026 16:54:18 +0200 Subject: [PATCH] fix perl requirements and re-add perl CA --- epics-base.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/epics-base.spec b/epics-base.spec index 605e67f5d..a3977b09d 100644 --- a/epics-base.spec +++ b/epics-base.spec @@ -62,16 +62,15 @@ BuildRequires: gcc-toolset-12-gcc-c++ Requires: perl-interpreter >= 5.10.1 BuildRequires: perl-interpreter >= 5.10.1 Requires: perl-File-Path perl-Getopt-Long perl-Pod-Usage perl-Time-HiRes perl-Data-Dumper perl-Scalar-List-Utils -BuildRequires: perl-File-Path perl-Getopt-Long perl-Pod-Usage perl-Time-HiRes perl-Data-Dumper perl-Scalar-List-Utils +BuildRequires: perl-devel %if 0%{?rhel} >= 8 Requires: perl-Text-Tabs+Wrap -BuildRequires: perl-Text-Tabs+Wrap %endif %if 0%{?rhel} >= 9 Requires: perl-File-Find perl-File-Basename perl-File-Copy perl-FindBin perl-Getopt-Std perl-POSIX -BuildRequires: perl-File-Find perl-File-Basename perl-File-Copy perl-FindBin perl-Getopt-Std perl-POSIX +Requires: perl-Sys-Hostname perl-Test perl-Test-Simple %endif # Perl auto-detection is broken @@ -220,8 +219,6 @@ ls /opt/RHEL9 > /dev/null shopt -s extglob %{__rm} -f %{buildroot}%{prog_folder}/bin/{V,RTEMS}*/{*Harness,softIoc,softIocPVA} %{__rm} -f %{buildroot}%{prog_folder}/bin/RTEMS*/TEMP.* -%{__rm} -rf %{buildroot}%{prog_folder}/lib/perl/[0-9]* -%{__rm} -f %{buildroot}%{prog_folder}/lib/perl/CA.pm # fix permissions of caRepeater.service %{__chmod} 644 %{buildroot}%{prog_folder}/bin/*/caRepeater.service @@ -300,7 +297,11 @@ fi %{prog_folder}/bin/epics-base.sh %{prog_folder}/lib/perl/EpicsHostArch.pl +%{prog_folder}/lib/perl/CA.pm %dir %{prog_folder}/lib/perl +%dir %{prog_folder}/lib/perl/[0-9]* +%dir %{prog_folder}/lib/perl/[0-9]*/*-linux-thread-multi +%{prog_folder}/lib/perl/*/*-linux-thread-multi/libCap5.so # Install host binaries but avoid installing *.pl scripts # and other development tools