[GCC12] Update latest commit; sync g13 changes; add gcc-prereq spec

autotools.spec

@@ -5,23 +5,21 @@
 %define automake_version 1.16.3
 %define automake_maj %(echo %{automake_version} | cut -f1,2 -d.)
 %define libtool_version 2.4.6
-%define m4_version 1.4.18
+%define m4_version 1.4.19
 %define gettext_version 0.21
 %define pkgconfig_version 0.29.2
 Source0: http://ftp.gnu.org/gnu/autoconf/autoconf-%{autoconf_version}.tar.gz
 Source1: http://ftp.gnu.org/gnu/automake/automake-%{automake_version}.tar.gz
 Source2: http://ftp.gnu.org/gnu/libtool/libtool-%{libtool_version}.tar.gz
-Source3: http://ftp.gnu.org/gnu/m4/m4-%{m4_version}.tar.bz2
+Source3: http://ftp.gnu.org/gnu/m4/m4-%{m4_version}.tar.gz
 Source4: http://ftp.gnu.org/gnu/gettext/gettext-%{gettext_version}.tar.gz
 Source5: http://pkgconfig.freedesktop.org/releases/pkg-config-%{pkgconfig_version}.tar.gz
-Patch0: m4-centos8
 
 %prep
 %setup -D -T -b 0 -n autoconf-%{autoconf_version}
 %setup -D -T -b 1 -n automake-%{automake_version}
 %setup -D -T -b 2 -n libtool-%{libtool_version}
 %setup -D -T -b 3 -n m4-%{m4_version}
-%patch0 -p1
 %setup -D -T -b 4 -n gettext-%{gettext_version}
 %setup -D -T -b 5 -n pkg-config-%{pkgconfig_version}
 

bootstrap-bundle.spec

@@ -1,10 +1,10 @@
-### RPM external bootstrap-bundle 3.0
+### RPM external bootstrap-bundle 4.0
 ## NO_AUTO_DEPENDENCY
 ## NOCOMPILER
-
+AutoReqProv: no
 BuildRequires: gcc
-BuildRequires: db6-bootstrap lua-bootstrap file-bootstrap
-BuildRequires: xz-bootstrap libarchive-bootstrap
+BuildRequires: lua-bootstrap file-bootstrap zstd-bootstrap
+BuildRequires: xz-bootstrap libarchive-bootstrap sqlite-bootstrap
 
 %define keep_archives true
 
@@ -51,7 +51,7 @@ find %{i}/lib -type f ! -name '*.a' -writable -exec %{strip} {} \;
 # RPM requires it to generate requires/provides also (otherwise it ignores the files)
 find %{i}/lib -type f | xargs chmod 0755
 
-mv %{i}/lib/lib{lua,archive}.a %{i}/tmp
+mv %{i}/lib/lib{lua,archive,zstd}.a %{i}/tmp
 rm -f %{i}/lib/*.{l,}a
 mv %{i}/tmp/lib* %{i}/lib/
 rm -rf %{i}/tmp

bootstrap-driver.spec

@@ -1,4 +1,4 @@
-### RPM external bootstrap-driver 40.0
+### RPM external bootstrap-driver 42.0
 ## NOCOMPILER
 Requires: rpm
 BuildRequires: cms-common fakesystem
@@ -9,50 +9,58 @@ BuildRequires: cms-common fakesystem
 %build
 %install
 packageList=""
-echo requiredtools `echo %{requiredtools} | sed -e's|\s+| |;s|^\s+||'`
-for tool in `echo %{requiredtools} | sed -e's|\s+| |;s|^\s+||'`
-do
-    case X$tool in
-        Xdistcc|Xccache )
-        ;;
-        * )
-            toolcap=`echo $tool | tr a-z- A-Z_`
-            toolversion=$(eval echo $`echo ${toolcap}_VERSION`)
-            toolrevision=$(eval echo $`echo ${toolcap}_REVISION`)
-            echo $toolversion $toolrevision
-            packageList="$packageList external+${tool}+${toolversion}-1-${toolrevision}.%cmsplatf.rpm"
-        ;;
-    esac
+for tool in $(echo %{directpkgreqs} | tr '/' '+') ; do
+  packageList="$packageList ${tool}-1-1.%{cmsplatf}.rpm"
 done
 
 additionalProvides=""
 ##############################
 # Packages to seed for runtime
 ##############################
-platformSeeds="bash tcsh perl bzip2-libs glibc nspr nss nss-util popt zlib glibc-devel openssl openssl-devel openssl-libs krb5-libs
-               libcom_err libX11 libXext libXft libXpm libglvnd-glx libglvnd-opengl mesa-libGLU"
+platformSeeds="  bash glibc glibc-headers python3 openssl-libs"
+platformSeeds+=" libbrotli libX11 libxcrypt"
+
 # Needed by python runtime
 platformSeeds+=" readline ncurses-libs tcl tk"
+
+# Needed by root runtime
+platformSeeds+=" mesa-libGLU libglvnd-glx libglvnd-opengl libXext libXft libXpm"
+
+#Various packages perl dependencies
+platformSeeds+=" perl perl-base perl-filetest perl-lib perl-libs perl-overload perl-vars"
+
+#Various packages required by xrootd with krb5 enabled
+platformSeeds+=" libcom_err krb5-libs"
+
 # Seed packages which provides these
-packagesWithProvides="/usr/bin/python3 /usr/bin/perl /usr/bin/env /usr/bin/uname"
+packagesWithProvides=" /usr/bin/python3 /usr/bin/env /usr/bin/uname /bin/sh /usr/bin/perl"
 
 ##############################
 #Packages to seed for build
 ##############################
-platformBuildSeeds="git patch make zip unzip bzip2 java-1.8.0-openjdk-devel libcom_err-devel which libXpm-devel libXft-devel mesa-libGLU-devel rsync"
-#Needed by autotools,go and lcov
-#platformBuildSeeds+=" perl-Carp perl-Data-Dumper perl-Digest-MD5 perl-Exporter perl-File-Path perl-File-Temp perl-Getopt-Long perl-PathTools perl-Text-ParseWords perl-constant"
+platformBuildSeeds="  git patch make zip unzip bzip2 which rsync"
+platformBuildSeeds+=" openssl-devel brotli-devel libxcrypt-devel"
+platformBuildSeeds+=" libX11-devel libXpm-devel libXft-devel mesa-libGLU-devel"
+platformBuildSeeds+=" java-1.8.0-openjdk-devel"
+
+#Various packages required by xrootd with krb5 enabled
+platformBuildSeeds+=" libcom_err-devel krb5-devel"
+
 #needed by python build
 platformBuildSeeds+=" readline-devel ncurses-devel tcl-devel tk-devel"
+
+##############################
+#Packages which provides a definition
+##############################
 packagesWithBuildProvides=""
 
 %ifnarch aarch64
 # Needed by oracle
 platformSeeds+=" libaio"
 %endif
 
-%if "%{rhel}" != "7"
-  platformSeeds+=" libxcrypt perl-libs"
+%if "%{rhel}" == "9"
+platformSeeds+=" libgcc"
 %endif
 
 defaultPkgs="cms+cms-common+1.0 cms+fakesystem+1.0"

cepgen-gcc12.patch

@@ -0,0 +1,10 @@
+--- a/CepGen/Utils/Drawer.h.orig	2023-06-05 11:45:35.916095554 +0200
++++ b/CepGen/Utils/Drawer.h	2023-06-05 11:46:11.721935669 +0200
+@@ -20,6 +20,7 @@
+ #define CepGen_Utils_Drawer_h
+
+ #include "CepGen/Modules/NamedModule.h"
++#include <cstdint>
+
+ namespace cepgen {
+   namespace utils {

cepgen.spec

@@ -4,9 +4,11 @@ Source: https://github.com/cepgen/cepgen/archive/refs/tags/%{realversion}.tar.gz
 
 BuildRequires: cmake ninja
 Requires: gsl OpenBLAS hepmc hepmc3 lhapdf pythia6 root bz2lib zlib xz
+Patch0: cepgen-gcc12
 
 %prep
 %setup -n %{n}-%{realversion}
+%patch0 -p1
 
 %build
 rm -rf ../build

dd4hep.spec

@@ -1,9 +1,9 @@
-### RPM external dd4hep v01-25x
+### RPM external dd4hep v01-26x
 ## INCLUDE compilation_flags
 ## INCLUDE compilation_flags_lto
 ## INCLUDE cpp-standard
 
-%define tag b07fa115c59d80d37154cf205cf00dff8137ee36
+%define tag 8715c52c1c8b3c714d80896cb8540f3f8f888786
 %define branch master
 %define github_user AIDASoft
 %define keep_archives true

file-bootstrap.spec

@@ -1,5 +1,6 @@
 ### RPM external file-bootstrap 5.33
 %define file_tag %(echo FILE%{realversion} | tr . _)
+AutoReqProv: no
 Source: https://github.com/file/file/archive/%{file_tag}.tar.gz
 
 %prep  

gbl.spec

@@ -1,4 +1,4 @@
-### RPM external gbl V02-04-01
+### RPM external gbl V03-00-00
 ## INCLUDE cpp-standard
 
 %define tag 31e726d777fe93cdbed0c363dc15f803f7767f40