Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f3683bc
Update version numbers for dependencies in spec file
akritkbehera Feb 11, 2026
0eec3a5
Get py312 changes (#1)
akritkbehera Feb 12, 2026
35e837a
Rename patch file for UUID daemon disable
akritkbehera Feb 12, 2026
d64814b
Fix f2py script creation in numpy.file
akritkbehera Feb 12, 2026
81256cd
Add tblib version 1.7.0 to requirements
akritkbehera Feb 12, 2026
27f61d4
patch removed for gcc14
akritkbehera Feb 12, 2026
fe33de8
updates
akritkbehera Feb 12, 2026
63079ab
Disable HarfBuzz in freetype build configuration
akritkbehera Feb 12, 2026
032d2dd
Fix patches
akritkbehera Feb 13, 2026
b40b1d8
frontier client patch update
akritkbehera Feb 13, 2026
3fb616e
New changes
akritkbehera Feb 16, 2026
f635e6f
update tf 2.17 with gcc15 fixes
smuzaffar Feb 16, 2026
6d18259
Update build process to include numpy installation
smuzaffar Feb 16, 2026
7998552
Update TensorFlow source tag to new version
smuzaffar Feb 16, 2026
9a13f63
Update TensorFlow source tag in spec file
smuzaffar Feb 17, 2026
00fd553
Update TensorFlow source tag in spec file
smuzaffar Feb 17, 2026
f54d91b
Fixed absl patch
akritkbehera Feb 17, 2026
c0446f2
tensorflow-xla fixes
akritkbehera Feb 17, 2026
b78bce3
Using TOOL_BASE is vectorized.tmpl would that work? test.
Feb 17, 2026
76739be
Update scram-tools
Feb 17, 2026
c4ad325
Update tensorflow to use CXX20 for G15
Feb 17, 2026
7376779
Update zlib version to 1.3.2
akritkbehera Feb 18, 2026
921b5d0
Update zlib version from 1.3.1 to 1.3.2
akritkbehera Feb 18, 2026
b6ef103
zlib updates, lhapdf docs dropped, gmake reverted
akritkbehera Feb 18, 2026
f344a09
Move BuildRequires from tensorflow-sources.file
akritkbehera Feb 19, 2026
38c98a7
Update tensorflow-requires.file build dependencies
akritkbehera Feb 19, 2026
44a493d
Add py3-opt-einsum to requirements
akritkbehera Feb 19, 2026
40677e3
Fix environment variable reference in tensorflow.xml
akritkbehera Feb 20, 2026
693f5b2
Delete pip/pip directory
akritkbehera Feb 20, 2026
4adca29
Fix environment variable syntax in tensorflow.xml
akritkbehera Feb 20, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions autotools.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
%define automake_maj %(echo %{automake_version} | cut -f1,2 -d.)
%define libtool_version 2.5.4
%define m4_version 1.4.19
%define gettext_version 0.22
%define gettext_version 0.22.5
%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.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

BuildRequires: gmake
#pkg-config GCC 15 patch
Patch0: autotools-pkg-config-gcc15

Expand Down
28 changes: 14 additions & 14 deletions bazel-absl.patch
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
--- bazel/distdir_deps.bzl.orig 2023-06-12 11:36:07.650810578 +0200
+++ bazel/distdir_deps.bzl 2023-06-12 11:37:10.490300045 +0200
@@ -162,17 +162,17 @@
diff --git a/distdir_deps.bzl b/distdir_deps.bzl
index a3cd93a..f756645 100755
--- a/distdir_deps.bzl
+++ b/distdir_deps.bzl
@@ -229,16 +229,16 @@ DIST_DEPS = {
],
},
"com_google_absl": {
- "archive": "20211102.0.tar.gz",
- "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4",
+ "archive": "20230802.3.tar.gz",
+ "sha256": "052d1384266a3da0a4d16b644d7f9c4c2bfec4855720ac988a9407aebc06a3d8",
- "archive": "20230802.0.tar.gz",
- "sha256": "59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5",
+ "archive": "20230802.2.tar.gz",
+ "sha256": "7c11539617af1f332f0854a6fb21e296a1b29c27d03f23c7b49d4adefcd102cc",
"urls": [
- "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
- "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
+ "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20230802.3.tar.gz",
+ "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.3.tar.gz",
- "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.0.tar.gz",
+ "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.2.tar.gz",
],
"used_in": [
"additional_distfiles",
"test_WORKSPACE_files",
],
- "strip_prefix": "abseil-cpp-20211102.0",
+ "strip_prefix": "abseil-cpp-20230802.3",
- "strip_prefix": "abseil-cpp-20230802.0",
+ "strip_prefix": "abseil-cpp-20230802.2",
},
"zstd-jni": {
"archive": "v1.5.0-4.zip",
"archive": "v1.5.2-3.zip",
4 changes: 2 additions & 2 deletions bazel-gcc14.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ diff --git a/third_party/zlib/BUILD b/third_party/zlib/BUILD
index f1aa936..7317aff 100755
--- a/third_party/zlib/BUILD
+++ b/third_party/zlib/BUILD
@@ -29,6 +29,7 @@ distrib_cc_library(
@@ -43,6 +43,7 @@ distrib_cc_library(
# Use -Dverbose=-1 to turn off zlib's trace logging. (#3280)
copts = [
"-w",
+ "-Wno-error=implicit-function-declaration",
"-Dverbose=-1",
],
includes = ["."],
enable_distributions = ["debian"],
5 changes: 3 additions & 2 deletions bazel.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external bazel 5.3.0
### RPM external bazel 6.5.0
## INCLUDE cpp-standard

Source: https://github.com/bazelbuild/bazel/releases/download/%{realversion}/bazel-%{realversion}-dist.zip
Expand Down Expand Up @@ -31,11 +31,12 @@ Patch2: bazel-gcc14
%build

export EXTRA_BAZEL_ARGS="--define=ABSOLUTE_JAVABASE=${JAVA_HOME} --jobs %{compiling_processes}"
export BAZEL_CXXOPTS="-std=c++%{cms_cxx_standard}"
export BAZEL_CXXOPTS="-Wno-error=deprecated:-std=c++%{cms_cxx_standard}"
${JAVA_HOME}/bin/java -version 2>&1 | grep -E -i 'openjdk version "[1-9]'
if [ $(${JAVA_HOME}/bin/java -version 2>&1 | grep -E -i 'openjdk version "[1-9]' | sed -E 's|.* "([0-9]+)[.].*|\1|') -ge 17 ] ; then
export JNI_FLAGS="--add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED"
fi
sed -i '/src\/main\/cpp\/util\/logging.h/a #include <cstdint>' src/main/cpp/blaze.h
bash ./compile.sh

%install
Expand Down
34 changes: 34 additions & 0 deletions blackhat.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/my_programs/Makefile.am b/my_programs/Makefile.am
index 6fef244..c35abe4 100644
--- a/my_programs/Makefile.am
+++ b/my_programs/Makefile.am
@@ -65,13 +65,13 @@ LINKER_ARGS += -lmpfr -lgmpxx -lgmp
CXXFLAGS += -DBH_USE_GMP
endif

-include $(DEPDIR)/*.Po
-
%.o: $(abs_srcdir)/%.cpp
test -f $(DEPDIR)/$*.Po || mkdir -p .deps ; echo "#dummy" > $(DEPDIR)/$*.Po
$(CXX) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(INCLUDE) -o $@ $<
mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

+#include $(DEPDIR)/*.Po
+
LINKER_FLAGS=$(AM_LDFLAGS)
if GMP_PATH_SET
LINKER_FLAGS += -L$(AM_GMP_PATH)
diff --git a/configure.ac b/configure.ac
index 2099377..6396f8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
AC_INIT([BlackHat], [0.9.9], [daniel.maitre@durham.ac.uk])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([-Wall foreign])
AM_DISABLE_STATIC
AC_PROG_CXX
+AM_PROG_AR
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AC_CHECK_FUNCS([pow log sqrt])
4 changes: 4 additions & 0 deletions blackhat.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
%define branch cms/v%{realversion}
%define github_user cms-externals
Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
BuildRequires: autotools
Requires: qd python3
Patch0: blackhat

%prep
%setup -n %{n}-%{realversion}
%patch0 -p1

sed -i -e 's|else return Cached_OLHA_user_normal|else return new Cached_OLHA_user_normal|' src/cached_OLHA.cpp

Expand All @@ -17,6 +20,7 @@ rm -f ./config.{sub,guess}
chmod +x ./config.{sub,guess}

%build
autoreconf -ivf
PYTHON=$(which python3) ./configure --prefix=%i \
--with-QDpath=$QD_ROOT \
--enable-pythoninterface=no \
Expand Down
6 changes: 3 additions & 3 deletions bz2lib.spec
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
### RPM external bz2lib 1.0.6
Source: http://www.bzip.org/%{realversion}/bzip2-%{realversion}.tar.gz
### RPM external bz2lib 1.0.8
Source: https://gitlab.com/bzip2/bzip2/-/archive/bzip2-%{realversion}/bzip2-bzip2-%{realversion}.tar.gz

%prep
%setup -n bzip2-%{realversion}
%setup -n bzip2-bzip2-%{realversion}
sed -e 's/ -shared/ -dynamiclib/' \
-e 's/ -Wl,-soname -Wl,[^ ]*//' \
-e 's/libbz2\.so/libbz2.dylib/g' \
Expand Down
1 change: 1 addition & 0 deletions cmake.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
%define downloaddir %(echo %realversion | cut -d. -f1,2)
Source: http://www.cmake.org/files/v%{downloaddir}/%n-%realversion.tar.gz
Requires: bz2lib curl expat zlib
BuildRequires: gmake

%prep
%setup -n cmake-%realversion
Expand Down
13 changes: 13 additions & 0 deletions coral-2_3_21-py312.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/PyCoral/src/Attribute.cpp b/PyCoral/src/Attribute.cpp
index 7b08bb9..eeda695 100644
--- a/src/PyCoral/src/Attribute.cpp
+++ b/src/PyCoral/src/Attribute.cpp
@@ -15,7 +15,7 @@
#define PyString_Check PyUnicode_Check
#define PyString_AsString PyUnicode_AsUTF8
#define PyString_AS_STRING PyUnicode_AsUTF8
- #define PyString_GET_SIZE PyUnicode_GET_SIZE
+ #define PyString_GET_SIZE PyUnicode_GET_LENGTH
#endif

// Ignore 'dereferencing type-punned pointer' warnings caused by
7 changes: 3 additions & 4 deletions coral.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@

Patch0: coral-2_3_20-macosx
Patch1: coral-2_3_21-gcc8
Patch5: coral-2_3_21-py312
Requires: coral-tool-conf

%define cvssrc %{n}

# Build with debug symbols, and package them in a separate rpm:
%define subpackageDebug yes

# Disable building tests, since they bring dependency on cppunit:
%ifarch darwin
%define patchsrc2 perl -p -i -e 's!(<classpath.*/tests\\+.*>)!!;' config/BuildFile.xml
%define patchsrc3 %patch0 -p1
%define patchsrc3 %patch0 -p1
%endif
%define patchsrc5 %patch5 -p1

# Drop Oracle interface on ARM machines and POWER machines.
# Oracle does not provide Instant Client for ARMv8 or POWER8.
Expand Down
11 changes: 4 additions & 7 deletions curl.spec
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
%if 0%{?rhel} > 9
%define curl_version 8.13.0
%else
%define curl_version 7.79.0
%endif
### RPM external curl %{curl_version}
Source: https://curl.se/download/%{n}-%{realversion}.tar.gz
### RPM external curl 8.13.0
Source: http://curl.haxx.se/download/%{n}-%{realversion}.tar.gz
Requires: zlib
BuildRequires: gmake

%prep
%setup -n %{n}-%{realversion}
Expand All @@ -23,6 +19,7 @@ Requires: zlib
--disable-static \
--without-libidn \
--without-zstd \
--without-libpsl \
--disable-ldap \
--with-zlib=${ZLIB_ROOT} \
--without-nss \
Expand Down
2 changes: 2 additions & 0 deletions db6.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
### RPM external db6 6.2.32
Source: http://cmsrep.cern.ch/cmssw/download/db-%{realversion}.tar.gz
BuildRequires: gmake

%define drop_files %{i}/docs
%define strip_files %{i}/lib

Expand Down
4 changes: 2 additions & 2 deletions eigen.spec
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
### RPM external eigen 3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e
### RPM external eigen c1d637433e3b3f9012b226c2c9125c494b470ae6
## INITENV +PATH PKG_CONFIG_PATH %{i}/share/pkgconfig
## NOCOMPILER
## INCLUDE cpp-standard
%define tag 6c8cca61b173180e2013bd76d33099c665ccb858
%define tag b25e86af3379e35cd267d337693684dcdbdfd5d1
%define branch cms/master/%{realversion}
%define github_user cms-externals
Source: git+https://github.com/%{github_user}/eigen-git-mirror.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
Expand Down
3 changes: 2 additions & 1 deletion expat.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
### RPM external expat 2.4.8
### RPM external expat 2.7.1
## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64
Source: http://downloads.sourceforge.net/project/%{n}/%{n}/%{realversion}/%{n}-%{realversion}.tar.gz
BuildRequires: gmake

%define drop_files %{i}/share

Expand Down
11 changes: 0 additions & 11 deletions flatbuffers-7422.patch

This file was deleted.

9 changes: 3 additions & 6 deletions flatbuffers.spec
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
### RPM external flatbuffers 2.0.6
### RPM external flatbuffers 24.3.25
## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64

## INCLUDE cpp-standard
%define tag v%{realversion}
%define branch master
%define github_user google
Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
Source1: https://patch-diff.githubusercontent.com/raw/google/flatbuffers/pull/7227.diff
Patch0: flatbuffers-7422

BuildRequires: cmake gmake

%prep
%setup -n %{n}-%{realversion}
%patch0 -p1
patch -p1 <%{_sourcedir}/7227.diff

%build
rm -rf ../build
Expand All @@ -23,6 +19,7 @@ cd ../build
cmake ../%{n}-%{realversion} \
-DCMAKE_BUILD_TYPE=Release \
-DFLATBUFFERS_BUILD_CPP17=ON \
-DFLATBUFFERS_CPP_STD=%{cms_cxx_standard}\
-DFLATBUFFERS_BUILD_SHAREDLIB=ON \
-DFLATBUFFERS_BUILD_TESTS=OFF \
-DCMAKE_INSTALL_PREFIX="%{i}"
Expand Down
36 changes: 21 additions & 15 deletions freetype.spec
Original file line number Diff line number Diff line change
@@ -1,27 +1,33 @@
### RPM external freetype 2.10.0
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{realversion}.tar.bz2
### RPM external freetype 2.13.2
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{realversion}.tar.gz
Requires: bz2lib zlib libpng
BuildRequires: gmake cmake

%prep
%setup -n %{n}-%{realversion}

%build
./configure \
--prefix %{i} \
--with-bzip2==${BZ2LIB_ROOT} \
--with-zlib=${ZLIB_ROOT} \
--with-png=${LIBPNG_ROOT} \
--with-harfbuzz=no
rm -rf ../build && mkdir ../build && cd ../build

make %{makeprocesses}
cmake ../%{n}-%{realversion} \
-DCMAKE_BUILD_TYPE=Release \
-DFT_DISABLE_HARFBUZZ=TRUE \
-DFT_REQUIRE_ZLIB=TRUE \
-DFT_REQUIRE_BZIP2=TRUE \
-DFT_REQUIRE_PNG=TRUE \
-DCMAKE_PREFIX_PATH=%{cmake_prefix_path} \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX="%{i}"

make %{makeprocesses} VERBOSE=1

%install
cd ../build
make install
%ifos darwin
install_name_tool -id %{i}/lib/libfreetype-cms.dylib -change %{i}/lib/libfreetype.6.dylib %{i}/lib/libfreetype-cms.dylib %{i}/lib/libfreetype.6.dylib
ln -s libfreetype.6.dylib %{i}/lib/libfreetype-cms.dylib
perl -p -i -e 's|-lfreetype|-lfreetype-cms|' %{i}/bin/freetype-config
%endif

# Strip libraries, we are not going to debug them.
%define strip_files %{i}/lib
%{relocateConfig}lib/cmake/freetype/freetype-config-release.cmake
%{relocateConfig}lib/cmake/freetype/freetype-config-version.cmake
%{relocateConfig}lib/cmake/freetype/freetype-config.cmake
%{relocateConfig}lib/pkgconfig/freetype2.pc
2 changes: 2 additions & 0 deletions frontier_client.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@

Source: http://frontier.cern.ch/dist/frontier_client__%{realversion}__src.tar.gz
Requires: expat pacparser zlib
Patch0: frontier_client_py312

%prep
%setup -n %{n}__%{realversion}__src
%patch0 -p1

%define makeargs "EXPAT_DIR=${EXPAT_ROOT} PACPARSER_DIR=${PACPARSER_ROOT} COMPILER_TAG=gcc_$(gcc -dumpversion) ZLIB_DIR=${ZLIB_ROOT}"

Expand Down
20 changes: 20 additions & 0 deletions frontier_client_py312.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- ./python/lib/frontier.py.orig 2024-08-21 10:32:39.531373649 +0200
+++ ./python/lib/frontier.py 2024-08-21 10:33:03.642433236 +0200
@@ -241,7 +241,7 @@
if len(variables) != 0:
raise ProgrammingError('Bind variables used, but parameters were not provided.')

- elif isinstance(parameters, collections.Sequence):
+ elif isinstance(parameters, collections.abc.Sequence):
if len(parameters) != len(variables):
raise ProgrammingError('Different length on parameters (%s) and bind variables list (%s) while using positional parameters.' % (len(parameters), len(variables)))

@@ -250,7 +250,7 @@

final_parameters = parameters

- elif isinstance(parameters, collections.Mapping):
+ elif isinstance(parameters, collections.abc.Mapping):
for variable in variables:
if isinstance(parameters[variable[1:]],datetime.datetime):
operation = operation.replace(variable,_stringify(parameters[variable[1:]]))
Loading