From 316ba90b83d680fcbb7bd246ef2a353860275f09 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Mon, 11 May 2026 11:20:44 +0200 Subject: [PATCH] extend spec file for RHEL10 --- epics-base.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/epics-base.spec b/epics-base.spec index 0b1f386d7..b6ce86d8c 100644 --- a/epics-base.spec +++ b/epics-base.spec @@ -5,7 +5,7 @@ Name: epics-base-%{EpicsVersion} Summary: EPICS Base %{EpicsVersion} Version: 1 -Release: 1%{?dist} +Release: 2%{?dist} License: EPICS Open License Group: Development/Languages URL: https://git.psi.ch/epics_base/base-7.0 @@ -17,6 +17,7 @@ Obsoletes: caRepeater = 1 %define debug_package %{nil} %define _build_id_links none +%define source_date_epoch_from_changelog 0 # do not strip libraries %global __strip /bin/true @@ -31,6 +32,10 @@ Obsoletes: caRepeater = 1 %endif # else define epics_host_arch as suitable +BuildRequires: make >= 3.80 +BuildRequires: readline-devel +BuildRequires: clang + %description EPICS is a set of Open Source software tools, libraries and applications developed collaboratively and used worldwide to create distributed soft @@ -42,7 +47,7 @@ This RPM is a binary-only package. %package host-devel Requires: make >= 3.80 -BuildRequires: make >= 3.80 +Requires: readline-devel Summary: Minimal stuff needed to build EPICS host apps Requires: %{name} = %{version}-%{release} @@ -138,8 +143,11 @@ Requires: wine %endif # For some 32 bit cross compilers +# unavailable for RHEL10+: use wrapper (see CONFIG_SITE.RHEL10-x86_64.Common) +%if 0%{?rhel} <= 9 BuildRequires: /lib/libc.so.6 Requires: /lib/libc.so.6 +%endif %description devel All what is needed to develop EPICS for different target architectures. @@ -206,6 +214,8 @@ export EPICS_HOST_ARCH=%{epics_host_arch} 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 @@ -284,11 +294,7 @@ 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