public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/xrootd] epel8: Update EPEL 8 and 9 to XRootD 6
@ 2026-11-22  9:06 Mattias Ellert
  0 siblings, 0 replies; only message in thread
From: Mattias Ellert @ 2026-11-22  9:06 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/xrootd
Branch : epel8
Commit : 9401000c60e8aa803522a4f7361caa45ac280aa2
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date   : 2026-11-22T09:55:42+01:00
Stats  : +273/-106 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/xrootd/c/9401000c60e8aa803522a4f7361caa45ac280aa2?branch=epel8

Log:
Update EPEL 8 and 9 to XRootD 6

---
diff --git a/xrootd.spec b/xrootd.spec
index d7f1ff6..2bd6da1 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -8,6 +8,9 @@
 %global ceph 0
 %endif
 
+# Needed for EPEL 8
+%undefine __cmake_in_source_build
+
 Name:		xrootd
 Epoch:		1
 Version:	6.2.1
@@ -280,6 +283,11 @@ rm -r vendor/googletest
 rm -r vendor/picojson
 %endif
 
+%if %{?rhel}%{!?rhel:0} == 8
+# These tests require a newer gmock than the one in EPEL 8
+sed '/add_subdirectory(unit)/d' -i tests/CMakeLists.txt
+%endif
+
 %build
 %cmake \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -415,7 +423,7 @@ done
 
 touch testfile
 if ( setfattr -n user.testattr -v testvalue testfile ) ; then
-    %ctest -- -E \
+    excluded=\
 XRootD::badredir\|\
 %ifarch %{ix86} %{arm}
 XRootD::posix\|\
@@ -424,6 +432,7 @@ XrdCl::tpc-http-timeout\|\
 %endif
 XrdCl::FileSystemTest.PlugInTest\|\
 XrdCl::FileTest.PlugInTest
+    %ctest -- -E "${excluded}"
 else
     echo "Extended file attributes not supported by file system"
     echo "*** NOT RUNNING TESTS ***"

diff --git a/0001-Make-documentation-self-contained.patch b/0001-Make-documentation-self-contained.patch
new file mode 100644
index 0000000..bba4217
--- /dev/null
+++ b/0001-Make-documentation-self-contained.patch
@@ -0,0 +1,30 @@
+From 8b924dbc92d3cce474421fbd7974f3d22d64d51c Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 12 Aug 2026 17:00:45 +0200
+Subject: [PATCH] Make documentation self-contained
+
+---
+ README.md | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/README.md b/README.md
+index bafd1112d..167d476e0 100644
+--- a/README.md
++++ b/README.md
+@@ -1,12 +1,5 @@
+-[![Repology](https://img.shields.io/badge/repology-xrootd-blue)](https://repology.org/project/xrootd/packages)
+-[![CDash](https://img.shields.io/badge/CDash-XRootD-limegreen)](https://my.cdash.org/index.php?project=XRootD)
+-[![ABI](https://github.com/xrootd/xrootd/actions/workflows/ABI.yml/badge.svg)](https://github.com/xrootd/xrootd/actions/workflows/ABI.yml)
+-[![CI](https://github.com/xrootd/xrootd/actions/workflows/CI.yml/badge.svg)](https://github.com/xrootd/xrootd/actions/workflows/CI.yml)
+-[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/11900/badge)](https://www.bestpractices.dev/projects/11900)
+-[![LFX Health Score](https://insights.linuxfoundation.org/api/badge/health-score?project=xrootd)](https://insights.linuxfoundation.org/project/xrootd)
+-
+ <p align="center">
+-  <img src="https://xrootd.org/images/xrootd-logo.png"/>
++  <img src="xrootd-logo.png"/>
+ </p>
+ 
+ ## XRootD: eXtended ROOT Daemon
+-- 
+2.55.0
+

diff --git a/0001-Unbundle-gtest.patch b/0001-Unbundle-gtest.patch
new file mode 100644
index 0000000..1bbac2e
--- /dev/null
+++ b/0001-Unbundle-gtest.patch
@@ -0,0 +1,25 @@
+From cd11f615e749a1fcdd353edd30505c4e8da897db Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 11 Aug 2026 23:53:15 +0200
+Subject: [PATCH] Unbundle gtest
+
+---
+ cmake/XRootDFindLibs.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/XRootDFindLibs.cmake b/cmake/XRootDFindLibs.cmake
+index e47dfb83e..3788f5ed4 100644
+--- a/cmake/XRootDFindLibs.cmake
++++ b/cmake/XRootDFindLibs.cmake
+@@ -89,7 +89,7 @@ if( ENABLE_XRDOSSARC )
+ endif()
+ 
+ if( ENABLE_TESTS )
+-  add_subdirectory(vendor/googletest EXCLUDE_FROM_ALL)
++  find_package( GTest REQUIRED )
+ 
+   set( BUILD_TESTS TRUE )
+ 
+-- 
+2.55.0
+

diff --git a/0001-Unbundle-tinyxml.patch b/0001-Unbundle-tinyxml.patch
new file mode 100644
index 0000000..9c98c2c
--- /dev/null
+++ b/0001-Unbundle-tinyxml.patch
@@ -0,0 +1,62 @@
+From bd81e2e922bd44c755ad77cf29ca45570cc934ec Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 21 Apr 2026 00:38:07 +0200
+Subject: [PATCH] Unbundle tinyxml
+
+---
+ cmake/FindTinyXml.cmake           | 18 ++++++++++++++++++
+ src/XrdXml/tinyxml/CMakeLists.txt | 12 ++++++++++++
+ 2 files changed, 30 insertions(+)
+ create mode 100644 cmake/FindTinyXml.cmake
+
+diff --git a/cmake/FindTinyXml.cmake b/cmake/FindTinyXml.cmake
+new file mode 100644
+index 000000000..75c752707
+--- /dev/null
++++ b/cmake/FindTinyXml.cmake
+@@ -0,0 +1,18 @@
++FIND_PATH(TINYXML_INCLUDE_DIR tinyxml.h
++  HINTS
++  ${TINYXML_DIR}
++  $ENV{TINYXML_DIR}
++  /usr
++  PATH_SUFFIXES include
++)
++
++FIND_LIBRARY(TINYXML_LIBRARIES tinyxml
++  HINTS
++  ${TINYXML_DIR}
++  $ENV{TINYXML_DIR}
++  /usr
++  PATH_SUFFIXES lib
++)
++
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(TinyXml DEFAULT_MSG TINYXML_LIBRARIES TINYXML_INCLUDE_DIR)
+diff --git a/src/XrdXml/tinyxml/CMakeLists.txt b/src/XrdXml/tinyxml/CMakeLists.txt
+index db7d4924e..f87ed8f46 100644
+--- a/src/XrdXml/tinyxml/CMakeLists.txt
++++ b/src/XrdXml/tinyxml/CMakeLists.txt
+@@ -1,3 +1,13 @@
++find_package(TinyXml)
++
++if(TINYXML_FOUND)
++
++add_library(XrdTinyXml INTERFACE IMPORTED GLOBAL)
++set_property(TARGET XrdTinyXml PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${TINYXML_INCLUDE_DIR}")
++set_property(TARGET XrdTinyXml PROPERTY INTERFACE_LINK_LIBRARIES "${TINYXML_LIBRARIES}")
++
++else()
++
+ add_library(XrdTinyXml OBJECT
+   tinystr.cpp       tinystr.h
+   tinyxml.cpp       tinyxml.h
+@@ -13,3 +23,5 @@ set_target_properties(XrdTinyXml
+ target_include_directories(XrdTinyXml
+   PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ )
++
++endif()
+-- 
+2.53.0
+

diff --git a/sources b/sources
index 0c281c6..fa5f23d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xrootd-5.9.9.tar.gz) = 14ebe643f21e01065f40d02d370efa8832b81ce9f682d83ec79093daee88cba0bd3e14ad0038d8bbbb95b3ea457c3fbd972c895aafd0d3a9096814a98ac157f0
+SHA512 (xrootd-6.2.1.tar.gz) = 3a60060509181aeb03cbff5b3c00ff7c4ca20390a30635e012e5460713c8e53f9a0a23b4cfd107dd7f23927727c7c4e9841b227c6a2b4708f8007f2bbe78f9af

diff --git a/xrootd.spec b/xrootd.spec
index e95b855..2bd6da1 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -13,7 +13,7 @@
 
 Name:		xrootd
 Epoch:		1
-Version:	5.9.9
+Version:	6.2.1
 Release:	1%{?dist}
 Summary:	Extended ROOT file server
 License:	LGPL-3.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND curl AND MIT AND Zlib AND Apache-2.0 AND MPL-2.0
@@ -21,6 +21,13 @@ URL:		https://xrootd.org
 Source0:	https://xrootd.web.cern.ch/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:	%{name}-sysusers.conf
 
+#		Unbundle tinyxml library
+Patch0:		0001-Unbundle-tinyxml.patch
+#		Unbundle googletest/googlemock
+Patch1:		0001-Unbundle-gtest.patch
+#		Make documentation self-contained
+Patch2:		0001-Make-documentation-self-contained.patch
+
 BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	make
@@ -30,6 +37,7 @@ BuildRequires:	krb5-devel
 BuildRequires:	libcurl-devel
 BuildRequires:	tinyxml-devel
 BuildRequires:	libxml2-devel
+BuildRequires:	libzip-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel
 BuildRequires:	perl-generators
@@ -47,11 +55,11 @@ BuildRequires:	python3-pip
 BuildRequires:	python3-setuptools
 BuildRequires:	python3-wheel
 BuildRequires:	json-c-devel
+BuildRequires:	json-devel
 BuildRequires:	libmacaroons-devel
 BuildRequires:	libuuid-devel
 BuildRequires:	voms-devel
 BuildRequires:	scitokens-cpp-devel
-BuildRequires:	davix-devel
 BuildRequires:	libxcrypt-devel
 %if %{ceph}
 BuildRequires:	librados-devel
@@ -67,13 +75,15 @@ BuildRequires:	python3-sphinx
 #		For tests
 BuildRequires:	attr
 BuildRequires:	curl
-BuildRequires:	davix
 BuildRequires:	gtest-devel
+BuildRequires:	gmock-devel
 BuildRequires:	jq
 BuildRequires:	krb5-server
 BuildRequires:	krb5-workstation
 BuildRequires:	openssl
 BuildRequires:	procps
+BuildRequires:	python3-pytest
+BuildRequires:	sqlite
 
 Requires:	%{name}-server%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-selinux = %{epoch}:%{version}-%{release}
@@ -135,6 +145,8 @@ development.
 
 %package client-libs
 Summary:	Libraries used by xrootd clients
+Provides:	xrdcl-http = %{epoch}:%{version}-%{release}
+Obsoletes:	xrdcl-http < 1:6.0.0
 Requires:	%{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description client-libs
@@ -229,15 +241,6 @@ SciToken passed during a transfer. Configured appropriately, this
 allows the XRootD server admin to delegate authorization decisions for
 a subset of the namespace to an external issuer.
 
-%package -n xrdcl-http
-Summary:	HTTP client plugin for XRootD
-Requires:	%{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Requires:	%{name}-client-libs%{?_isa} = %{epoch}:%{version}-%{release}
-
-%description -n xrdcl-http
-xrdcl-http is an XRootD client plugin which allows XRootD to interact
-with HTTP repositories.
-
 %if %{ceph}
 %package ceph
 Summary:	XRootD plugin for interfacing with the Ceph storage platform
@@ -268,11 +271,21 @@ This package contains the API documentation of the xrootd libraries.
 %prep
 %setup -q
 
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+
 # Delete bundled dependencies
 rm src/XrdXml/tinyxml/tiny*
+rm -r vendor/googletest
 %if %{?fedora}%{!?fedora:0}
 # picojson not in RHEL/EPEL
-rm -r src/XrdSciTokens/vendor/picojson
+rm -r vendor/picojson
+%endif
+
+%if %{?rhel}%{!?rhel:0} == 8
+# These tests require a newer gmock than the one in EPEL 8
+sed '/add_subdirectory(unit)/d' -i tests/CMakeLists.txt
 %endif
 
 %build
@@ -283,8 +296,8 @@ rm -r src/XrdSciTokens/vendor/picojson
 %if %{ceph}
     -DENABLE_CEPH:BOOL=ON \
 %endif
-%ifarch %{ix86}
-    -DENABLE_XRDEC:BOOL=OFF \
+%ifnarch %{ix86}
+    -DENABLE_XRDEC:BOOL=ON \
 %endif
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
     -DPIP_OPTIONS="--no-deps --use-pep517 --no-build-isolation --disable-pip-version-check --verbose" \
@@ -294,12 +307,9 @@ rm -r src/XrdSciTokens/vendor/picojson
     -DXRD_PYTHON_REQ_VERSION=%{python3_version}
 %cmake_build
 
-make -C packaging/common -f /usr/share/selinux/devel/Makefile
+make -C config -f /usr/share/selinux/devel/Makefile
 
 doxygen Doxyfile
-# Use local image instead of remote
-sed 's!src=".*/xrootd-logo.png"!src="xrootd-logo.png"!' \
-    -i doxydoc/html/index.html
 cp -p docs/images/xrootd-logo.png doxydoc/html
 
 %install
@@ -320,45 +330,43 @@ rm -f %{buildroot}%{_libdir}/cmake/XRootD/uninstall.cmake
 LD_LIBRARY_PATH=%{buildroot}%{_libdir} \
 PYTHONPATH=%{buildroot}%{python3_sitearch} \
 PYTHONDONTWRITEBYTECODE=1 \
-make -C bindings/python/docs html
+make -C python/docs html
 
 # Service unit files
 mkdir -p %{buildroot}%{_unitdir}
-install -m 644 -p packaging/common/xrootd@.service %{buildroot}%{_unitdir}
-install -m 644 -p packaging/common/xrootd@.socket %{buildroot}%{_unitdir}
-install -m 644 -p packaging/common/xrdhttp@.socket %{buildroot}%{_unitdir}
-install -m 644 -p packaging/common/cmsd@.service %{buildroot}%{_unitdir}
-install -m 644 -p packaging/common/frm_xfrd@.service %{buildroot}%{_unitdir}
-install -m 644 -p packaging/common/frm_purged@.service %{buildroot}%{_unitdir}
-mkdir -p %{buildroot}%{_tmpfilesdir}
-install -m 644 -p packaging/rhel/xrootd.tmpfiles %{buildroot}%{_tmpfilesdir}/%{name}.conf
+install -m 644 -p systemd/xrootd@.service %{buildroot}%{_unitdir}
+install -m 644 -p systemd/xrootd@.socket %{buildroot}%{_unitdir}
+install -m 644 -p systemd/xrdhttp@.socket %{buildroot}%{_unitdir}
+install -m 644 -p systemd/cmsd@.service %{buildroot}%{_unitdir}
+install -m 644 -p systemd/frm_xfrd@.service %{buildroot}%{_unitdir}
+install -m 644 -p systemd/frm_purged@.service %{buildroot}%{_unitdir}
 
 mkdir -p %{buildroot}%{_sysusersdir}
 install -m 644 -p %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.conf
 
 # Server config
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}
-install -m 644 -p packaging/common/%{name}-clustered.cfg \
+install -m 644 -p config/%{name}-clustered.cfg \
     %{buildroot}%{_sysconfdir}/%{name}/%{name}-clustered.cfg
-install -m 644 -p packaging/common/%{name}-standalone.cfg \
+install -m 644 -p config/%{name}-standalone.cfg \
     %{buildroot}%{_sysconfdir}/%{name}/%{name}-standalone.cfg
-install -m 644 -p packaging/common/%{name}-filecache-clustered.cfg \
+install -m 644 -p config/%{name}-filecache-clustered.cfg \
     %{buildroot}%{_sysconfdir}/%{name}/%{name}-filecache-clustered.cfg
-install -m 644 -p packaging/common/%{name}-filecache-standalone.cfg \
+install -m 644 -p config/%{name}-filecache-standalone.cfg \
     %{buildroot}%{_sysconfdir}/%{name}/%{name}-filecache-standalone.cfg
-sed 's!/usr/lib64/!!' packaging/common/%{name}-http.cfg > \
+install -m 644 -p config/%{name}-http.cfg \
     %{buildroot}%{_sysconfdir}/%{name}/%{name}-http.cfg
 
 # Client config
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d
-install -m 644 -p packaging/common/client.conf \
+install -m 644 -p config/client.conf \
     %{buildroot}%{_sysconfdir}/%{name}/client.conf
-sed 's!/usr/lib/!!' packaging/common/client-plugin.conf.example > \
-    %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d/client-plugin.conf.example
-sed -e 's!/usr/lib64/!!' -e 's!-5!!' packaging/common/recorder.conf > \
+install -m 644 -p config/client.plugins.d/http.conf \
+    %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d/http.conf
+install -m 644 -p config/client.plugins.d/recorder.conf \
     %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d/recorder.conf
-sed 's!/usr/lib64/!!' packaging/common/http.client.conf.example > \
-    %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d/xrdcl-http-plugin.conf
+install -m 644 -p config/client.plugins.d/s3.conf \
+    %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d/s3.conf
 
 chmod 644 %{buildroot}%{_datadir}/%{name}/utils/XrdCmsNotify.pm
 
@@ -376,18 +384,18 @@ mkdir -p %{buildroot}%{_localstatedir}/spool/%{name}
 mkdir -p %{buildroot}%{_rundir}/%{name}
 
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-install -m 644 -p packaging/common/%{name}.logrotate \
+install -m 644 -p config/%{name}.logrotate \
     %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
 mkdir -p %{buildroot}%{_datadir}/selinux/packages/%{name}
-install -m 644 -p packaging/common/%{name}.pp \
+install -m 644 -p config/%{name}.pp \
     %{buildroot}%{_datadir}/selinux/packages/%{name}
 
 # Documentation
 mkdir -p %{buildroot}%{_pkgdocdir}
 cp -pr doxydoc/html %{buildroot}%{_pkgdocdir}
 
-cp -pr bindings/python/docs/build/html %{buildroot}%{_pkgdocdir}/python
+cp -pr python/docs/build/html %{buildroot}%{_pkgdocdir}/python
 rm %{buildroot}%{_pkgdocdir}/python/.buildinfo
 
 %check
@@ -408,10 +416,23 @@ for x in authenticated_cluster badredir cluster TPCTests xcachewithcsi ; do
 done
 
 # The badredir test fails when there is no network - exclude
+# The posix test is broken for 32 bit archs ...
+# https://github.com/xrootd/xrootd/issues/2559
+# XrdCl::tpc-http-bigfiles and XrdCl::tpc-http-timeout broken on 32 bit
+# https://github.com/xrootd/xrootd/issues/2972
 
 touch testfile
 if ( setfattr -n user.testattr -v testvalue testfile ) ; then
-    %ctest -- -E XRootD::badredir\|XrdCl::FileSystemTest.PlugInTest\|XrdCl::FileTest.PlugInTest
+    excluded=\
+XRootD::badredir\|\
+%ifarch %{ix86} %{arm}
+XRootD::posix\|\
+XrdCl::tpc-http-bigfiles\|\
+XrdCl::tpc-http-timeout\|\
+%endif
+XrdCl::FileSystemTest.PlugInTest\|\
+XrdCl::FileTest.PlugInTest
+    %ctest -- -E "${excluded}"
 else
     echo "Extended file attributes not supported by file system"
     echo "*** NOT RUNNING TESTS ***"
@@ -422,8 +443,6 @@ rm testfile
 %sysusers_create_compat %{SOURCE1}
 
 %post server
-%tmpfiles_create %{name}.conf
-
 if [ $1 -eq 1 ] ; then
     systemctl daemon-reload >/dev/null 2>&1 || :
 fi
@@ -486,7 +505,6 @@ fi
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/utils
 %{_unitdir}/*
-%{_tmpfilesdir}/%{name}.conf
 %{_sysusersdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %dir %{_sysconfdir}/%{name}/config.d
@@ -506,18 +524,18 @@ fi
 %{_libdir}/libXrdUtils.so.*
 %{_libdir}/libXrdXml.so.*
 # Plugins
-%{_libdir}/libXrdCksCalczcrc32-5.so
-%{_libdir}/libXrdCryptossl-5.so
-%{_libdir}/libXrdSec-5.so
-%{_libdir}/libXrdSecProt-5.so
-%{_libdir}/libXrdSecgsi-5.so
-%{_libdir}/libXrdSecgsiAUTHZVO-5.so
-%{_libdir}/libXrdSecgsiGMAPDN-5.so
-%{_libdir}/libXrdSeckrb5-5.so
-%{_libdir}/libXrdSecpwd-5.so
-%{_libdir}/libXrdSecsss-5.so
-%{_libdir}/libXrdSecunix-5.so
-%{_libdir}/libXrdSecztn-5.so
+%{_libdir}/libXrdCksCalczcrc32-6.so
+%{_libdir}/libXrdCryptossl-6.so
+%{_libdir}/libXrdSec-6.so
+%{_libdir}/libXrdSecProt-6.so
+%{_libdir}/libXrdSecgsi-6.so
+%{_libdir}/libXrdSecgsiAUTHZVO-6.so
+%{_libdir}/libXrdSecgsiGMAPDN-6.so
+%{_libdir}/libXrdSeckrb5-6.so
+%{_libdir}/libXrdSecpwd-6.so
+%{_libdir}/libXrdSecsss-6.so
+%{_libdir}/libXrdSecunix-6.so
+%{_libdir}/libXrdSecztn-6.so
 %license COPYING* LICENSE
 
 %files devel
@@ -553,16 +571,20 @@ fi
 %{_libdir}/libXrdSsiLib.so.*
 %{_libdir}/libXrdSsiShMap.so.*
 # Plugins
-%{_libdir}/libXrdClProxyPlugin-5.so
-%{_libdir}/libXrdClRecorder-5.so
+%{_libdir}/libXrdClHttp-6.so
+%{_libdir}/libXrdClProxyPlugin-6.so
+%{_libdir}/libXrdClRecorder-6.so
+%{_libdir}/libXrdClS3-6.so
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/client.conf
 %dir %{_sysconfdir}/%{name}/client.plugins.d
-%config(noreplace) %{_sysconfdir}/%{name}/client.plugins.d/client-plugin.conf.example
+%config(noreplace) %{_sysconfdir}/%{name}/client.plugins.d/http.conf
 %config(noreplace) %{_sysconfdir}/%{name}/client.plugins.d/recorder.conf
+%config(noreplace) %{_sysconfdir}/%{name}/client.plugins.d/s3.conf
 
 %files client-devel
 %{_includedir}/%{name}/XrdCl
+%{_includedir}/%{name}/XrdClHttp
 %{_includedir}/%{name}/XrdPosix
 %{_libdir}/libXrdCl.so
 %{_libdir}/libXrdFfs.so
@@ -572,26 +594,28 @@ fi
 %{_libdir}/libXrdHttpUtils.so.*
 %{_libdir}/libXrdServer.so.*
 # Plugins
-%{_libdir}/libXrdBlacklistDecision-5.so
-%{_libdir}/libXrdBwm-5.so
-%{_libdir}/libXrdCmsRedirectLocal-5.so
-%{_libdir}/libXrdFileCache-5.so
-%{_libdir}/libXrdHttp-5.so
-%{_libdir}/libXrdHttpCors-5.so
-%{_libdir}/libXrdHttpTPC-5.so
-%{_libdir}/libXrdMacaroons-5.so
-%{_libdir}/libXrdN2No2p-5.so
-%{_libdir}/libXrdOfsPrepGPI-5.so
-%{_libdir}/libXrdOssCsi-5.so
-%{_libdir}/libXrdOssSIgpfsT-5.so
-%{_libdir}/libXrdOssStats-5.so
-%{_libdir}/libXrdPfc-5.so
-%{_libdir}/libXrdPfcPurgeQuota-5.so
-%{_libdir}/libXrdPss-5.so
-%{_libdir}/libXrdSsi-5.so
-%{_libdir}/libXrdSsiLog-5.so
-%{_libdir}/libXrdThrottle-5.so
-%{_libdir}/libXrdXrootd-5.so
+%{_libdir}/libXrdBlacklistDecision-6.so
+%{_libdir}/libXrdBwm-6.so
+%{_libdir}/libXrdCmsRedirectLocal-6.so
+%{_libdir}/libXrdFileCache-6.so
+%{_libdir}/libXrdHttp-6.so
+%{_libdir}/libXrdHttpCors-6.so
+%{_libdir}/libXrdHttpTPC-6.so
+%{_libdir}/libXrdMacaroons-6.so
+%{_libdir}/libXrdN2No2p-6.so
+%{_libdir}/libXrdOfsPrepGPI-6.so
+%{_libdir}/libXrdOssArc-6.so
+%{_libdir}/libXrdOssCsi-6.so
+%{_libdir}/libXrdOssMirage-6.so
+%{_libdir}/libXrdOssSIgpfsT-6.so
+%{_libdir}/libXrdOssStats-6.so
+%{_libdir}/libXrdPfc-6.so
+%{_libdir}/libXrdPfcPurgeQuota-6.so
+%{_libdir}/libXrdPss-6.so
+%{_libdir}/libXrdSsi-6.so
+%{_libdir}/libXrdSsiLog-6.so
+%{_libdir}/libXrdThrottle-6.so
+%{_libdir}/libXrdXrootd-6.so
 
 %files server-devel
 %{_includedir}/%{name}/XrdAcc
@@ -638,25 +662,21 @@ fi
 %{_mandir}/man1/xrootdfs.1*
 
 %files voms
-%{_libdir}/libXrdVoms-5.so
-%{_libdir}/libXrdHttpVOMS-5.so
-%{_libdir}/libXrdSecgsiVOMS-5.so
+%{_libdir}/libXrdVoms-6.so
+%{_libdir}/libXrdHttpVOMS-6.so
+%{_libdir}/libXrdSecgsiVOMS-6.so
 %doc %{_mandir}/man1/libXrdVoms.1*
 %doc %{_mandir}/man1/libXrdSecgsiVOMS.1*
 %doc src/XrdVoms/README.md
 
 %files scitokens
-%{_libdir}/libXrdAccSciTokens-5.so
+%{_libdir}/libXrdAccSciTokens-6.so
 %doc src/XrdSciTokens/README.md
 
-%files -n xrdcl-http
-%{_libdir}/libXrdClHttp-5.so
-%config(noreplace) %{_sysconfdir}/%{name}/client.plugins.d/xrdcl-http-plugin.conf
-
 %if %{ceph}
 %files ceph
-%{_libdir}/libXrdCeph-5.so
-%{_libdir}/libXrdCephXattr-5.so
+%{_libdir}/libXrdCeph-6.so
+%{_libdir}/libXrdCephXattr-6.so
 %{_libdir}/libXrdCephPosix.so.*
 %endif
 
@@ -669,27 +689,48 @@ fi
 %doc %{_pkgdocdir}
 
 %changelog
-* Sat Oct 31 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.9-1
-- Update to version 5.9.9
+* Sat Oct 31 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:6.2.1-1
+- Update to version 6.2.1
 - Drop patches accepted upstream
 
-* Sun Oct 11 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.8-2
+* Sun Oct 11 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:6.2.0-2
 - Some fixes for the python bindings
 
-* Tue Oct 06 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.8-1
-- Update to version 5.9.8
+* Tue Oct 06 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:6.2.0-1
+- Update to version 6.2.0
+
+* Fri Sep 11 2026 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:6.1.1-2
+- Rebuilt for libxml-2.5.4
+
+* Wed Aug 12 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:6.1.1-1
+- Update to version 6.1.1
+
+* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 1:6.1.0-3
+- Rebuilt for Python 3.15.0b4 ABI change
 
-* Wed Aug 12 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.7-1
-- Update to version 5.9.7
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:6.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 
-* Wed Jun 24 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.6-1
-- Update to version 5.9.6
+* Tue Jun 23 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:6.1.0-1
+- Update to version 6.1.0
+- Drop patches accepted upstream
+
+* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1:6.0.3-3
+- Rebuilt for openssl 4.0
+
+* Thu Jun 04 2026 Python Maint <python-maint@redhat.com> - 1:6.0.3-2
+- Rebuilt for Python 3.15
 
-* Tue Jun 02 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.5-1
-- Update to version 5.9.5
+* Tue Jun 02 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:6.0.3-1
+- Update to version 6.0.3
+
+* Thu May 21 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:6.0.2-1
+- Update to version 6.0.2
+- Adapt to OpenSSL 4.0
+- Drop patches accepted upstream
 
-* Mon Jun 01 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.4-1
-- Update to version 5.9.4
+* Sat Apr 11 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:6.0.0-1
+- Update to version 6.0.0
 
 * Fri Mar 27 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.2-1
 - Update to version 5.9.2

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-22  9:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-22  9:06 [rpms/xrootd] epel8: Update EPEL 8 and 9 to XRootD 6 Mattias Ellert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox