[rpms/xrootd] f45: Update to version 6.1.1

[rpms/xrootd] f45: Update to version 6.1.1

[Mattias Ellert]

A new commit has been pushed.

Repo   : rpms/xrootd
Branch : f45
Commit : e4ad3a28d2c1d0ecbdcd9cefa05f05dc8c8b5faa
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date   : 2026-08-13T07:56:03+02:00
Stats  : +89/-12 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/xrootd/c/e4ad3a28d2c1d0ecbdcd9cefa05f05dc8c8b5faa?branch=f45

Log:
Update to version 6.1.1

---
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/sources b/sources
index f669827..a960b85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xrootd-6.1.0.tar.gz) = bd471f3267de4aa520d091caca5c630adc42481da1ad4de534b515ec3cb7f4c3b428dbdfd92ed05ba8897811153b29eb425bc4a002546c81996aeafd1385d0c2
+SHA512 (xrootd-6.1.1.tar.gz) = ac1286cc54c60611bf17b6140b8cd7ef17a8318a4082cae38e5da040199ce4405490e583b376074c3ed29cf2d87c9bbda5da15c6a3091c83c7877abdc3343ebf

diff --git a/xrootd.spec b/xrootd.spec
index 7a7fdd3..d2d55a4 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -8,13 +8,10 @@
 %global ceph 0
 %endif
 
-# Needed for EPEL 8
-%undefine __cmake_in_source_build
-
 Name:		xrootd
 Epoch:		1
-Version:	6.1.0
-Release:	3%{?dist}
+Version:	6.1.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
 URL:		https://xrootd.web.cern.ch
@@ -23,6 +20,10 @@ 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++
@@ -37,6 +38,10 @@ BuildRequires:	libzip-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel
 BuildRequires:	perl-generators
+%if %{?fedora}%{!?fedora:0}
+# picojson not in RHEL/EPEL
+BuildRequires:	picojson-devel
+%endif
 BuildRequires:	readline-devel
 BuildRequires:	zlib-devel
 BuildRequires:	selinux-policy-devel
@@ -68,6 +73,7 @@ BuildRequires:	python3-sphinx
 BuildRequires:	attr
 BuildRequires:	curl
 BuildRequires:	gtest-devel
+BuildRequires:	gmock-devel
 BuildRequires:	jq
 BuildRequires:	krb5-server
 BuildRequires:	krb5-workstation
@@ -262,6 +268,17 @@ This package contains the API documentation of the xrootd libraries.
 %setup -q
 
 %patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+
+# Delete bundled dependencies
+rm src/XrdXml/tinyxml/tiny*
+rm -r vendor/bats
+rm -r vendor/googletest
+%if %{?fedora}%{!?fedora:0}
+# picojson not in RHEL/EPEL
+rm -r vendor/picojson
+%endif
 
 %build
 %cmake \
@@ -285,9 +302,6 @@ This package contains the API documentation of the xrootd libraries.
 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
@@ -394,14 +408,18 @@ 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
 
 touch testfile
 if ( setfattr -n user.testattr -v testvalue testfile ) ; then
+    %ctest -- -E \
+XRootD::badredir\|\
 %ifarch %{ix86} %{arm}
-    %ctest -- -E 'XRootD::badredir|XRootD::posix'
-%else
-    %ctest -- -E 'XRootD::badredir'
+XRootD::posix\|\
 %endif
+XrdCl::FileSystemTest.PlugInTest\|\
+XrdCl::FileTest.PlugInTest
 else
     echo "Extended file attributes not supported by file system"
     echo "*** NOT RUNNING TESTS ***"
@@ -525,6 +543,7 @@ fi
 %{_libdir}/libXrdUtils.so
 %{_libdir}/libXrdXml.so
 %{_libdir}/cmake/XRootD
+%{_mandir}/man1/xrootd-config.1*
 
 %files client-libs
 %{_libdir}/libXrdCl.so.*
@@ -657,6 +676,9 @@ fi
 %doc %{_pkgdocdir}
 
 %changelog
+* 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