fix problems with LD_LIBRARY_PATH when not installing to final location (e.g. when building RPMs)

for older RHEL7 versions because of backward compatibility problems with RPM.
Remove the exception in CONFIG_SITE.Common.linuxCommon for release 7.0.8!
Create links with full version shared library names to allow programs built
against previous rpm version to run.

configure/CONFIG_COMMON

@@ -422,10 +422,10 @@ INSTALL_LIB_INSTALLS = $(addprefix $(INSTALL_LIB)/,$(notdir $(LIB_INSTALLS)))
 
 #---------------------------------------------------------------
 # Installed file permissions
-BIN_PERMISSIONS = 555
-LIB_PERMISSIONS = 444
-SHRLIB_PERMISSIONS = 555
-INSTALL_PERMISSIONS = 444
+BIN_PERMISSIONS = 755
+LIB_PERMISSIONS = 644
+SHRLIB_PERMISSIONS = 755
+INSTALL_PERMISSIONS = 644
 
 #---------------------------------------------------------------
 #

configure/RULES_BUILD

@@ -514,6 +514,13 @@ ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 	ln -s $< $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 endif # SHRLIB_VERSION
+else  # SHRLIB_SUFFIX
+ifeq ($(BUILD_CLASS),HOST)
+ifneq (,$(strip $(SHRLIB_VERSION)))
+	@$(RM) $@.$(SHRLIB_VERSION)
+	ln -s $< $@.$(SHRLIB_VERSION)
+endif # HOST
+endif # SHRLIB_VERSION
 endif # SHRLIB_SUFFIX
 
 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))

configure/os/CONFIG.Common.RHEL7-x86_64

@@ -1,6 +1,8 @@
 # Include definitions common to linux pentium targets
 include $(CONFIG)/os/CONFIG.Common.linux-x86_64
 
+BUILD_CLASS = HOST
+
 TOOLSET_LOCATION = /opt/rh
 TOOLSET = devtoolset-12
 STD_CXXFLAGS = -std=c++20

configure/os/CONFIG.Common.RHEL7-x86_64-clang

@@ -1 +1,3 @@
 include $(CONFIG)/os/CONFIG.Common.linux-clang
+
+BUILD_CLASS = HOST

configure/os/CONFIG.Common.RHEL8-x86_64

@@ -1,6 +1,8 @@
 # Include definitions common to linux pentium targets
 include $(CONFIG)/os/CONFIG.Common.linux-x86_64
 
+BUILD_CLASS = HOST
+
 TOOLSET_LOCATION = /opt/rh
 TOOLSET = gcc-toolset-12
 STD_CXXFLAGS = -std=c++20

configure/os/CONFIG.Common.RHEL8-x86_64-clang

@@ -1,3 +1,5 @@
 include $(CONFIG)/os/CONFIG.Common.linux-clang
 
+BUILD_CLASS = HOST
+
 STD_CXXFLAGS = -std=c++2a

configure/os/CONFIG.Common.RHEL9-x86_64

@@ -1,6 +1,8 @@
 # Include definitions common to linux pentium targets
 include $(CONFIG)/os/CONFIG.Common.linux-x86_64
 
+BUILD_CLASS = HOST
+
 TOOLSET_LOCATION = /opt/rh
 TOOLSET = gcc-toolset-12
 STD_CXXFLAGS = -std=c++20

configure/os/CONFIG.Common.RHEL9-x86_64-clang

@@ -1,3 +1,5 @@
 include $(CONFIG)/os/CONFIG.Common.linux-clang
 
+BUILD_CLASS = HOST
+
 STD_CXXFLAGS = -std=c++2a

configure/os/CONFIG.Common.V69-ppc32

@@ -1,3 +1,3 @@
 include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32
 VXWORKS_VERSION = 6.9
-#export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
+#export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH:%=%:)$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib

configure/os/CONFIG.Common.V69-ppc604

@@ -1,6 +1,6 @@
 include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
 VXWORKS_VERSION = 6.9
-#export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
+#export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH:%=%:)($(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
 
 # -fno-implicit-fp causes error: "unable to find a register to spill in class 'FLOAT_REGS'"
 ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align

configure/os/CONFIG.Common.linuxCommon

@@ -24,23 +24,17 @@ STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 
 # Set runtime path for shared libraries if LINKER_USE_RPATH=YES
-SHRLIBDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%))
+SHRLIBDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)) $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
 SHRLIBDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(SHRLIB_DEPLIB_DIRS))
 SHRLIBDIR_LDFLAGS += \
     $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
 
 # Set runtime path for products if LINKER_USE_RPATH=YES
-PRODDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%))
+PRODDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)) $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
 PRODDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(PROD_DEPLIB_DIRS))
 PRODDIR_LDFLAGS += \
     $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
 
-ifneq ($(LINKER_USE_RPATH:NO=),)
-ifeq ($(T_A),$(EPICS_HOST_ARCH))
-LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH:%=%:)$(INSTALL_LIB)
-endif
-endif
-
 # Link libraries controlled by COMMANDLINE_LIBRARY
 # The newest Linux versions only need readline, older ones need both
 # readline and ncurses, and the oldest need readline and curses

configure/os/CONFIG.Common.nilrt7-armv7a

@@ -10,7 +10,9 @@ GNU_TARGET = arm-linux-gnu
 
 SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi
 GNU_BIN = /opt/RHEL7/bin
-LD_LIBRARY_PATH=/usr/$$LIB:/opt/RHEL7/$$LIB
+
+# Needed on RHEL9:
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)/usr/$$LIB:/opt/RHEL7/$$LIB
 
 ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon
 ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi

configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64

@@ -12,7 +12,10 @@ include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 SYSROOT = /opt/RHEL7
 
 # "Cross" TOOLSET progs need to find their libraries
-LD_LIBRARY_PATH = $(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB)
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB)
+
+# The linker has problems to find indirectly referenced libraries
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB)
 
 # These programs have library problems when using them
 # from SYSROOT but without TOOLSET.

configure/os/CONFIG.RHEL9-x86_64.RHEL7-x86_64

@@ -12,7 +12,7 @@ include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 SYSROOT = /opt/RHEL7
 
 # "Cross" TOOLSET progs need to find their libraries
-LD_LIBRARY_PATH = $(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB:)/usr/$$LIB:$(SYSROOT)/usr/$$LIB
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB:)/usr/$$LIB:$(SYSROOT)/usr/$$LIB
 
 # The linker has problems to find indirectly referenced libraries
 PROD_LDLIBS += $(LDLIBS)

configure/os/CONFIG.RHEL9-x86_64.RHEL8-x86_64

@@ -15,7 +15,6 @@ SYSROOT = /opt/RHEL8
 # Thus only wrap the compiler.
 WRAPPER = -wrapper env,LD_LIBRARY_PATH=$(TOOLSET_DIR:%=$(SYSROOT)%/usr/lib64:)/usr/lib64:$(SYSROOT)/usr/lib64
 TARGET_CPPFLAGS += $(WRAPPER)
-TARGET_PROD_LDFLAGS += $(WRAPPER)
 
 # These programs as cross tools would also need LD_LIBRARY_PATH.
 # But but our host versions work just fine.

configure/os/CONFIG_SITE.Common.linuxCommon

@@ -21,3 +21,9 @@ TARGET_LDFLAGS  += $(SYSROOT:%=--sysroot=%)
 ifeq ($(filter SL% RHEL%,$(T_A)),)
 VALID_BUILDS = Ioc Command
 endif
+
+# backward compatibility: Keep unversioned libs for older linux versions
+ifeq ($(filter SL% RHEL7% RHEL8%,$(T_A)),)
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+endif

configure/os/CONFIG_SITE.UnixCommon.Common

@@ -0,0 +1,5 @@
+# Make sure hosts tools find their libraries during build
+# even if FINAL_LOCATION differs from INSTALL_LOCATION
+ifneq ($(FINAL_LOCATION:$(INSTALL_LOCATION)=),)
+export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH:%=%:)$(INSTALL_HOST_LIB)
+endif

configure/os/CONFIG_SITE.linux-x86.Common

@@ -11,10 +11,6 @@ INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPIC
 GNU_HOST_ARCH=i686
 GNU_HOST_OS=linux
 
-# set LD_LIBRARY_PATH may cause problems for eldk53-ppc4xxFP
-# not exported LD_LIBRARY_PATH causes problem for RHEL7 cross compilation
-export LD_LIBRARY_PATH=
-
 # vxWorks for MVxxxx boards
 #CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
 #CROSS_COMPILER_TARGET_ARCHS += V67-ppc604

configure/os/CONFIG_SITE.linux-x86.RTEMS

@@ -4,5 +4,5 @@
 #-------------------------------------------------------
 
 # Needed by gcc
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(RTEMS_BASE)/lib
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(RTEMS_BASE)/lib
 

epics-base.sh

@@ -1,6 +1,6 @@
 _OLD_EXTGLOB=$(shopt -p extglob)
 shopt -s extglob
 test -n "$EPICS_HOST_ARCH" || export EPICS_HOST_ARCH=$(/bin/sed "s%cpe:/o:redhat:enterprise_linux:\([0-9]*\).*%RHEL\1-`/bin/uname -m`%" /etc/system-release-cpe)
-PATH=${PATH//\/usr\/local\/epics\/base-+([0-9]).+([0-9]).+([0-9])\/bin\/$EPICS_HOST_ARCH}:$(echo $(ls -dvr /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/$EPICS_HOST_ARCH) | tr ' ' :)
+PATH=${PATH//?(:)\/usr\/local\/epics\/base-+([0-9]).+([0-9]).+([0-9])\/bin\/$EPICS_HOST_ARCH?(:)}:$(echo $(ls -dvr /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/$EPICS_HOST_ARCH) | tr ' ' :)
 eval $_OLD_EXTGLOB
 unset _OLD_EXTGLOB

epics-base.spec

@@ -5,7 +5,7 @@
 Name:           epics-base-%{EpicsVersion}
 Summary:        EPICS Base %{EpicsVersion}
 Version:        1
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        EPICS Open License
 Group:          Development/Languages
 URL:            https://git.psi.ch/epics_base/base-7.0
@@ -28,6 +28,7 @@ Obsoletes:      caRepeater = 1
 %if %{defined rhel}
 %global epics_host_arch RHEL%{rhel}-%{_host_cpu}
 %endif
+# else define epics_host_arch as suitable
 
 %description
 EPICS is a set of Open Source software tools, libraries and applications
@@ -41,6 +42,8 @@ This RPM is a binary-only package.
 %package host-devel
 Requires:       make >= 3.80
 BuildRequires:  make >= 3.80
+BuildRequires:  gfa-cross-compiler-links
+BuildRequires:  wine
 
 Summary:    Minimal stuff needed to build EPICS host apps
 Requires:   %{name} = %{version}-%{release}
@@ -100,7 +103,6 @@ Contains EPICS binaries that run on other RHEL versions.
 Summary:        EPICS base %{EpicsVersion} for wine
 Requires:       %{name} = %{version}-%{release}
 Requires:       wine
-BuildRequires:  wine
 
 %description wine
 Allows to run EPICS in wine.
@@ -123,7 +125,6 @@ This package can be relocated.
 Summary:        EPICS base %{EpicsVersion} for development environments
 Requires:       %{name}             = %{version}-%{release}
 Requires:       %{name}-host-devel  = %{version}-%{release}
-Requires:       %{name}-boot        = %{version}-%{release}
 Requires:       gfa-cross-compiler-links
 BuildArch:      noarch
 AutoReqProv:    no
@@ -170,7 +171,7 @@ The documentation of EPICS base %{EpicsVersion}.
 
 # Our sources are locally in this directory
 # and here we also build
-# RPMS and SRPMS will be stored here, too
+# RPMS will be stored here, too
 %define _topdir %(pwd)
 %define _sourcedir %{_topdir}
 %define _builddir %{_topdir}
@@ -180,22 +181,33 @@ The documentation of EPICS base %{EpicsVersion}.
 %{__rm} -f modules/RELEASE.*.local
 git submodule update --init --recursive modules
 %{__mkdir_p} RPMS
-%{__mkdir_p} SRPMS
 
 %build
 %if %{defined epics_host_arch}
 export EPICS_HOST_ARCH=%{epics_host_arch}
 %endif
-%{__make} -j $RPM_BUILD_NCPUS INSTALL_LOCATION=%{buildroot}/%{prog_folder} FINAL_LOCATION=%{prog_folder}
-%{__make} INSTALL_LOCATION=%{buildroot}/%{prog_folder} copysrc
+%{__make} INSTALL_LOCATION=%{buildroot}%{prog_folder} FINAL_LOCATION=%{prog_folder}
+%{__make} INSTALL_LOCATION=%{buildroot}%{prog_folder} copysrc
 
 # remove files we do not need
 shopt -s extglob
-%{__rm} -f %{buildroot}/%{prog_folder}/bin/{V,RTEMS}*/{*Harness,softIoc,softIocPVA}
-%{__rm} -f %{buildroot}/%{prog_folder}/bin/RTEMS*/TEMP.*
+%{__rm} -f %{buildroot}%{prog_folder}/bin/{V,RTEMS}*/{*Harness,softIoc,softIocPVA}
+%{__rm} -f %{buildroot}%{prog_folder}/bin/RTEMS*/TEMP.*
+
+# fix permissions of caRepeater.service
+%{__chmod} 644 %{buildroot}%{prog_folder}/bin/*/caRepeater.service
 
 # install the profile script
-%{__install} epics-base.sh %{buildroot}/%{prog_folder}/bin
+%{__install} epics-base.sh %{buildroot}%{prog_folder}/bin
+
+# copy over old libraries for compatibility
+%if %{?rhel} > 7
+%{__cp} /opt/RHEL7/lib64/libreadline.so.6 %{buildroot}%{prog_folder}/lib/RHEL7-x86_64
+%endif
+%if %{?rhel} > 8
+%{__cp} /opt/RHEL7/lib64/libtinfo.so.5 %{buildroot}%{prog_folder}/lib/RHEL7-x86_64
+%{__cp} /opt/RHEL8/lib64/libreadline.so.7 %{buildroot}%{prog_folder}/lib/RHEL8-x86_64
+%endif
 
 # Do not use install section because build already installed
 # and install will delete our buildroot!
@@ -203,49 +215,47 @@ shopt -s extglob
 %clean
 %{__make} realclean
 %{__rm} -f modules/RELEASE.*.local
+%{__rm} -rf %{buildroot}
+%{__cp} %{_rpmdir}/*/%{name}*%{version}-%{release}.*.rpm %{_sourcedir}
 
 # Link caRepeater and profile script to highest installed EPICS version after install and uninstall
 %post
 shopt -s extglob
-
-if [ -e /etc/profile.d/epics-base.sh ]
-then
-    %{__rm} -f /etc/profile.d/epics-base.sh
-fi
+%{__rm} -f /etc/profile.d/epics-base.sh
 %{__ln_s} "$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/epics-base.sh | /usr/bin/head -n1)" /etc/profile.d/
-
 SYSTEMD_DIR=$(pkg-config systemd --variable=systemdsystemunitdir)
 if [ -n "$SYSTEMD_DIR" ]
 then
-    systemctl is-enabled caRepeater.service 2>/dev/null && systemctl disable --now caRepeater.service
-    test -e  $SYSTEMD_DIR/caRepeater.service && %{__rm} $SYSTEMD_DIR/caRepeater.service
-    %{__ln_s} "$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/%{epics_host_arch}/caRepeater.service | /usr/bin/head -n1)" $SYSTEMD_DIR/
+    %{__rm} -f $SYSTEMD_DIR/caRepeater.service
+    LATEST_REPEATER=$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/%{epics_host_arch}/caRepeater.service | /usr/bin/head -n1)
+    %{__ln_s} $LATEST_REPEATER $SYSTEMD_DIR/
     systemctl daemon-reload
-    killall caRepeater 2>/dev/null
-    systemctl enable --now caRepeater.service
+    systemctl reenable caRepeater.service
+    systemctl start caRepeater.service
 fi
 
 %postun
 shopt -s extglob
-
-if [ -e /etc/profile.d/epics-base.sh ]
-then
-    %{__rm} -f /etc/profile.d/epics-base.sh
-fi
+%{__rm} -f /etc/profile.d/epics-base.sh
 %{__ln_s} "$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/epics-base.sh 2>/dev/null | /usr/bin/head -n1)" /etc/profile.d/ 2>/dev/null
-
 SYSTEMD_DIR=$(pkg-config systemd --variable=systemdsystemunitdir)
 if [ -n "$SYSTEMD_DIR" ]
 then
-    systemctl disable --now caRepeater.service
-    %{__rm} -f $SYSTEMD_DIR/caRepeater.service
-    %{__ln_s} "$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/%{epics_host_arch}/caRepeater.service 2>/dev/null | /usr/bin/head -n1)" $SYSTEMD_DIR/ 2>/dev/null
-    systemctl daemon-reload
-    if [ -e $SYSTEMD_DIR/caRepeater.service ]
+    LATEST_REPEATER=$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/%{epics_host_arch}/caRepeater.service 2>/dev/null | /usr/bin/head -n1)
+    if [ -z "$LATEST_REPEATER" ]
     then
-        killall caRepeater 2>/dev/null
-        systemctl enable --now caRepeater.service
+        systemctl disable caRepeater.service
+        # Do not stop or restart caRepeater.service
+        # because EPICS clients cannot handle that.
+        # Next reboot will take care of this.
     fi
+    %{__rm} -f $SYSTEMD_DIR/caRepeater.service
+    if [ -n "$LATEST_REPEATER" ]
+    then
+        %{__ln_s} $LATEST_REPEATER $SYSTEMD_DIR/ 2>/dev/null
+        systemctl reenable caRepeater.service
+    fi
+    systemctl daemon-reload
 fi
 
 %files
@@ -262,36 +272,49 @@ fi
 %{prog_folder}/db
 
 %{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/*
+%dir %{prog_folder}/lib/perl/*/*-linux-thread-multi
+%{prog_folder}/lib/perl/*/*-linux-thread-multi/libCap5.so
 
 # Install host binaries but avoid installing *.pl scripts
 # and other development tools
 
-%if %{defined rhel}
-%dir %{prog_folder}/bin/RHEL%{rhel}*
-%{prog_folder}/bin/RHEL%{rhel}*/[Scips]*[^.]??
-%{prog_folder}/bin/RHEL%{rhel}*/p2p
-%{prog_folder}/bin/RHEL%{rhel}*/msi
-%dir %{prog_folder}/lib/RHEL%{rhel}*
-%{prog_folder}/lib/RHEL%{rhel}*/*.so*
-%endif
+%dir %{prog_folder}/bin/%{epics_host_arch}*
+%{prog_folder}/bin/%{epics_host_arch}*/[Scips]*[^.]??
+%{prog_folder}/bin/%{epics_host_arch}*/p2p
+%{prog_folder}/bin/%{epics_host_arch}*/msi
+%dir %{prog_folder}/lib/%{epics_host_arch}*
+%{prog_folder}/lib/%{epics_host_arch}*/*.so*
 
 ###########################################
 
 %files compat
 %if %{?rhel} > 7
-%{prog_folder}/bin/RHEL7*
+%dir %{prog_folder}/bin/RHEL7*
+%{prog_folder}/bin/RHEL7*/[Scips]*[^.]??
+%{prog_folder}/bin/RHEL7*/p2p
+%{prog_folder}/bin/RHEL7*/msi
 %dir %{prog_folder}/lib/RHEL7*
 %{prog_folder}/lib/RHEL7*/*.so*
 %endif
 
 %if %{?rhel} > 8
-%{prog_folder}/bin/RHEL8*
+%dir %{prog_folder}/bin/RHEL8*
+%{prog_folder}/bin/RHEL8*/[Scips]*[^.]??
+%{prog_folder}/bin/RHEL8*/p2p
+%{prog_folder}/bin/RHEL8*/msi
 %dir %{prog_folder}/lib/RHEL8*
 %{prog_folder}/lib/RHEL8*/*.so*
 %endif
 
 %if %{?rhel} > 9
-%{prog_folder}/bin/RHEL9*
+%dir %{prog_folder}/bin/RHEL9*
+%{prog_folder}/bin/RHEL9*/[Scips]*[^.]??
+%{prog_folder}/bin/RHEL9*/p2p
+%{prog_folder}/bin/RHEL9*/msi
 %dir %{prog_folder}/lib/RHEL9*
 %{prog_folder}/lib/RHEL9*/*.so*
 %endif
@@ -305,6 +328,7 @@ fi
 
 %files boot
 %defattr(-,root,root,-)
+%dir %{prog_folder}
 %dir %{prog_folder}/configure
 %{prog_folder}/configure/CONFIG_BASE_VERSION
 
@@ -324,6 +348,7 @@ fi
 %dir %{prog_folder}/bin/[a-z]*
 %{prog_folder}/bin/[a-z]*/[Scips]*[^.]??
 %{prog_folder}/bin/[a-z]*/msi*
+%{prog_folder}/bin/[a-z]*/acctst*
 %{prog_folder}/bin/[a-z]*/*.dll
 
 # vxWorks and RTEMS
@@ -337,29 +362,95 @@ fi
 
 %files host-devel
 %defattr(-,root,root,-)
-%{prog_folder}/configure
-%{prog_folder}/cfg
-%{prog_folder}/include
+%dir %{prog_folder}/include
+%{prog_folder}/include/*.h
+%{prog_folder}/include/compiler
+%dir %{prog_folder}/include/os
+%{prog_folder}/include/os/Linux/
+%{prog_folder}/include/os/WIN32/
+%{prog_folder}/include/pv/
+%{prog_folder}/include/pva/
+%{prog_folder}/include/valgrind/
+%{prog_folder}/include/flex.skel.static
 %{prog_folder}/templates
-%if %{defined rhel}
-%{prog_folder}/bin/RHEL%{rhel}*/[^Scips]*[^.]??
-%{prog_folder}/bin/RHEL%{rhel}*/*.??
-%endif
-%{prog_folder}/lib/pkgconfig
-%{prog_folder}/lib/perl
-%{prog_folder}/lib/win*
-%{prog_folder}/lib/RTEMS*
+%dir %{prog_folder}/cfg
+%{prog_folder}/cfg/CONFIG*
+%{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.%{epics_host_arch}*
+%{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.win*
+%dir %{prog_folder}/configure
+%{prog_folder}/configure/RELEASE
+%{prog_folder}/configure/CONFIG*
+%{prog_folder}/configure/RULES*
+%dir %{prog_folder}/configure/os
+%{prog_folder}/configure/os/CONFIG.Common.UnixCommon
+%{prog_folder}/configure/os/CONFIG.Common.linuxCommon
+%{prog_folder}/configure/os/CONFIG.Common.linux-clang
+%{prog_folder}/configure/os/CONFIG.Common.linux-%{_host_cpu}*
+%{prog_folder}/configure/os/CONFIG.Common.%{epics_host_arch}*
+%{prog_folder}/configure/os/CONFIG.UnixCommon.Common
+%{prog_folder}/configure/os/CONFIG.%{epics_host_arch}*.Common
+%{prog_folder}/configure/os/CONFIG.%{epics_host_arch}*.%{epics_host_arch}*
+%{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.Common
+%{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.linux-%{__isa_name}*
+%{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.win*
+%{prog_folder}/configure/os/CONFIG.Linux.win*
+%{prog_folder}/configure/os/CONFIG.win*.win*
+%{prog_folder}/configure/os/CONFIG_SITE.Common.linuxCommon
+%{prog_folder}/configure/os/CONFIG_SITE.Common.linux-%{__isa_name}*
+%{prog_folder}/configure/os/CONFIG_SITE.%{epics_host_arch}*.Common
+%{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.Common
+%{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.UnixCommon
+%{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.linux-%{__isa_name}*
+%{prog_folder}/bin/%{epics_host_arch}*/[^Scips]*[^.]??
+%{prog_folder}/bin/%{epics_host_arch}*/*.??
+%dir %{prog_folder}/lib/pkgconfig
+%{prog_folder}/lib/pkgconfig/epics-base.pc
+%{prog_folder}/lib/pkgconfig/epics-base-%{epics_host_arch}*.pc
+%{prog_folder}/lib/perl/EPICS
+%{prog_folder}/lib/perl/DBD*
 %{prog_folder}/dbd
 
 ###########################################
 
 %files devel
 %defattr(-,root,root,-)
-
-%{prog_folder}/bin/[a-z]*/[^Scips]*[^.]??
+%{prog_folder}/include/os/vxWorks/
+%{prog_folder}/include/os/RTEMS/
+%exclude %{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.%{epics_host_arch}*
+%exclude %{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.win*
+%{prog_folder}/cfg/TOOLCHAIN.*
+%exclude %{prog_folder}/configure/os/CONFIG.Common.%{epics_host_arch}*
+%exclude %{prog_folder}/configure/os/CONFIG.Common.UnixCommon
+%exclude %{prog_folder}/configure/os/CONFIG.Common.linuxCommon
+%exclude %{prog_folder}/configure/os/CONFIG.Common.linux-clang
+%exclude %{prog_folder}/configure/os/CONFIG.Common.linux-%{_host_cpu}*
+%exclude %{prog_folder}/configure/os/CONFIG.UnixCommon.Common
+%exclude %{prog_folder}/configure/os/CONFIG.%{epics_host_arch}*.Common
+%exclude %{prog_folder}/configure/os/CONFIG.%{epics_host_arch}*.%{epics_host_arch}*
+%exclude %{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.Common
+%exclude %{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.linux-%{__isa_name}*
+%exclude %{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.win*
+%exclude %{prog_folder}/configure/os/CONFIG.Linux.win*
+%exclude %{prog_folder}/configure/os/CONFIG.win*.win*
+%exclude %{prog_folder}/configure/os/CONFIG_SITE.Common.linuxCommon
+%exclude %{prog_folder}/configure/os/CONFIG_SITE.Common.linux-%{__isa_name}*
+%exclude %{prog_folder}/configure/os/CONFIG_SITE.%{epics_host_arch}*.Common
+%exclude %{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.Common
+%exclude %{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.UnixCommon
+%exclude %{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.linux-%{__isa_name}*
+%{prog_folder}/configure/os/
+%exclude %{prog_folder}/lib/pkgconfig/epics-base.pc
+%exclude %{prog_folder}/lib/pkgconfig/epics-base-%{epics_host_arch}*.pc
+%{prog_folder}/lib/pkgconfig/
+%exclude %{prog_folder}/bin/%{epics_host_arch}*/[^Scips]*[^.]??
+%exclude %{prog_folder}/bin/%{epics_host_arch}*/*.??
+%exclude %{prog_folder}/bin/*/[^Scips]*[^.]??
+%exclude %{prog_folder}/bin/*/*.??
 
 # VxWorks and RTEMS need static libs
 %{prog_folder}/lib/V*
+%{prog_folder}/lib/RTEMS*
+%{prog_folder}/lib/win*
 
 ###########################################
 
@@ -367,7 +458,9 @@ fi
 %defattr(-,root,root,-)
 
 # Install bulky static libs for Linux targets only on request
+%dir %{prog_folder}/lib/RHEL*
 %{prog_folder}/lib/RHEL*/*.a
+%dir %{prog_folder}/lib/[a-z]*
 %{prog_folder}/lib/[a-z]*/*.a
 
 ###########################################