bump rpm release

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -18,70 +18,6 @@ VXWORKS_VERSION = 6.9
 # architecture by adding it to an appropriate
 # CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
 
-#### Fixes for CONFIG.Common.vxWorksCommon  #######
-
-VX_GNU_VERSION_7 = 4.8.1.11
-
-
-# These are needed for vxWorks 6.x; the GNU toolset version number
-# is in the path to the compiler tools:
-VX_GNU_VERSION_5   = 2.96
-VX_GNU_VERSION_6 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
-VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
-VX_GNU_MAJOR_VERSION = $(firstword $(subst ., ,$(VX_GNU_VERSION)))
-VX_GNU_MINOR_VERSION = $(word 2,$(subst ., ,$(VX_GNU_VERSION)))
-
-# gcc version before 3.4 are "old" and need special treatment
-VX_OLD_GCC_2   = OLD
-VX_OLD_GCC_3.3 = OLD
-VX_OLD_GCC_3   = $(VX_OLD_GCC_3.$(VX_GNU_MINOR_VERSION))
-VX_OLD_GCC = $(VX_OLD_GCC_$(VX_GNU_MAJOR_VERSION))
-
-# vxWorks directory definitions
-VX_DIR_5 = $(WIND_BASE)
-VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
-VX_DIR_7 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/pkgs/os
-VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
-
-VX_INCLUDE_DIRS_5  = $(VX_DIR)/target/h
-VX_INCLUDE_DIRS_6  = $(VX_DIR)/target/h
-VX_INCLUDE_DIRS_6 += $(VX_DIR)/target/h/wrn/coreip
-VX_INCLUDE_DIRS_7  = $(VX_DIR)/core/kernel-1.2.8.0/h
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/lang-lib/libc-1.0.0.1/libc-kernel-1.0.8.0/h
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/utils/ostools-1.0.5.0/h
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/utils/ostools-1.0.5.0/shareh
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/arch/ppc-1.3.4.0/kernel/base/h/
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/arch/ppc-1.3.4.0/kernel/60x/h/arch/ppc/
-VX_INCLUDE_DIRS_7 += $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/samples/prebuilt_projects/vsb_vxsim_linux/krnl/h/public
-GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
-
-TARGET_CPPFLAGS_5 = -isystem $(VX_DIR)/target/h
-TARGET_CPPFLAGS_6 = -isystem $(VX_DIR)/target/h
-TARGET_CPPFLAGS_7 = -isystem $(VX_DIR)/core/kernel-1.2.8.0/h -D_VSB_CONFIG_FILE='<$(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/samples/prebuilt_projects/vsb_vxsim_linux/h/config/vsbConfig.h>'
-TARGET_CPPFLAGS = $(TARGET_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
-
-# vxWorks GNU directories
-
-GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
-GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
-GNU_DIR_7 = $(WIND_BASE)/compilers/gnu-$(VX_GNU_VERSION)/$(WIND_HOST_TYPE)
-GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
-
-# Operating system flags
-
-OP_SYS_INCLUDE_CPPFLAGS_5 += -include $(VX_DIR)/target/h/vxWorks.h
-OP_SYS_INCLUDE_CPPFLAGS_5 += -I$(EPICS_BASE)/include/os/vxWorks/vxWorks5
-OP_SYS_INCLUDE_CPPFLAGS_6 += -include $(VX_DIR)/target/h/vxWorks.h
-OP_SYS_INCLUDE_CPPFLAGS_7 += -include vxWorks.h
-OP_SYS_INCLUDE_CPPFLAGS = $(OP_SYS_INCLUDE_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
-
-OP_SYS_LDFLAGS += $(OP_SYS_LDFLAGS_$@)
-OP_SYS_LDFLAGS_softIoc = -whole-archive
-OP_SYS_LDFLAGS_softIocPVA = -whole-archive
-
-# code flags (delete -fno-implicit-templates)
-CODE_CXXFLAGS =
-
 # WIND_BASE is where you installed the Wind River software.
 
 #WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
@@ -89,14 +25,5 @@ CODE_CXXFLAGS =
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
 WIND_BASE = /opt/VxWorks/VxWorks$(VXWORKS_VERSION)
 
-#--------------------------------------------------
-# Modules we cannot build with old compiler
-
 # For the license counter
 export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
-
-PV_MODULES = pv% normativeTypes
-SKIP_BUILDS_5 = $(PV_MODULES)
-SKIP_BUILDS_OLD = $(PV_MODULES)
-SKIP_BUILDS_6 = $(SKIP_BUILDS_$(VX_OLD_GCC))
-SKIP_BUILDS = $(SKIP_BUILDS_$(VXWORKS_MAJOR_VERSION))

configure/os/CONFIG_SITE.RHEL8-x86_64.Common

@@ -4,4 +4,4 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
 CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64-clang
 
 # Build for old RHEL7 64 bit
-CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
+#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64

configure/os/CONFIG_SITE.RHEL9-x86_64.Common

@@ -7,4 +7,4 @@ CROSS_COMPILER_TARGET_ARCHS += RHEL9-x86_64-clang
 CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64
 
 # Build for old RHEL7 64 bit
-CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
+#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64

epics-base.spec

@@ -5,7 +5,7 @@
 Name:           epics-base-%{EpicsVersion}
 Summary:        EPICS Base %{EpicsVersion}
 Version:        2
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        EPICS Open License
 Group:          Development/Languages
 URL:            https://git.psi.ch/epics_base/base-7.0
@@ -54,11 +54,6 @@ Summary:    Minimal stuff needed to build EPICS host apps
 Requires:   %{name} = %{version}-%{release}
 
 # This EPICS installation uses the toolset 12 compiler
-%if 0%{?rhel} == 7
-Requires:       devtoolset-12-gcc-c++
-BuildRequires:  devtoolset-12-gcc-c++
-%endif
-
 %if 0%{?rhel} >= 8
 Requires:       gcc-toolset-12-gcc-c++
 BuildRequires:  gcc-toolset-12-gcc-c++
@@ -67,11 +62,8 @@ BuildRequires:  gcc-toolset-12-gcc-c++
 # The perl stuff we need
 Requires:       perl-interpreter >= 5.10.1
 BuildRequires:  perl-interpreter >= 5.10.1
-
-%if 0%{?rhel} >= 7
 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
-%endif
 
 %if 0%{?rhel} >= 8
 Requires:       perl-Text-Tabs+Wrap
@@ -92,13 +84,15 @@ Contains headers etc to build EPICS host applications.
 
 ###########################################
 
+%if %{?rhel} > 8
 %package compat
-Summary:        EPICS base %{EpicsVersion} for other RHEL versions
+Summary:        EPICS base %{EpicsVersion} for older RHEL versions
 Requires:       %{name} = %{version}-%{release}
 AutoReqProv:    no
 
 %description compat
-Contains EPICS binaries that run on other RHEL versions.
+Contains EPICS binaries that run on older RHEL versions.
+%endif
 
 ###########################################
 
@@ -208,11 +202,7 @@ shopt -s extglob
 /bin/sed 's!\$EPICS_BASE!%{prog_folder}!' epics-base.sh > %{buildroot}%{prog_folder}/bin/epics-base.sh
 
 # 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
 
@@ -265,6 +255,8 @@ then
     systemctl daemon-reload
 fi
 
+###########################################
+
 %files
 %defattr(-,root,root,-)
 %dir %{prog_folder}
@@ -282,8 +274,8 @@ fi
 %{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
+%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
@@ -298,24 +290,15 @@ fi
 
 ###########################################
 
-%files compat
-%if %{?rhel} > 7
-%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
+
+%files compat
 %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
 %dir %{prog_folder}/bin/RHEL9*
@@ -326,6 +309,8 @@ fi
 %{prog_folder}/lib/RHEL9*/*.so*
 %endif
 
+%endif
+
 ###########################################
 
 %files wine
@@ -378,8 +363,8 @@ fi
 %dir %{prog_folder}/lib/[a-z]*-*
 %{prog_folder}/lib/[a-z]*-*/*.so*
 %dir %{prog_folder}/lib/perl
-%{prog_folder}/lib/perl/EPICS
-%{prog_folder}/lib/perl/DBD*
+%{prog_folder}/lib/perl/[A-Z]*/
+%{prog_folder}/lib/perl/DBD.pm
 
 %dir %{prog_folder}/bin
 # avoid pulling in host files again
@@ -448,8 +433,8 @@ fi
 %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}/lib/perl/[A-Z]*/
+%{prog_folder}/lib/perl/DBD.pm
 %{prog_folder}/dbd
 
 ###########################################
@@ -492,7 +477,13 @@ fi
 # VxWorks and RTEMS need static libs
 %{prog_folder}/lib/V*
 %{prog_folder}/lib/RTEMS*
+# Windows needs *.lib
 %{prog_folder}/lib/win*
+# Basic libraries to build stand-alone clients
+%exclude %{prog_folder}/lib/pkgconfig
+%dir %{prog_folder}/lib/[a-z]*
+%{prog_folder}/lib/[a-z]*/libCom.so*
+%{prog_folder}/lib/[a-z]*/libca.so*
 
 ###########################################
 
@@ -518,4 +509,6 @@ fi
 %defattr(-,root,root,-)
 %dir %{prog_folder}
 %docdir %{prog_folder}/html
+%docdir %{prog_folder}/doc
 %{prog_folder}/html
+%{prog_folder}/doc