Fix specfile for old macros in EPEL 8 and 9

sources

@@ -1 +1 @@
-SHA512 (xrootd-5.9.2.tar.gz) = 4d904ba6e10dc4f6b8a3e3bfa306744376c0428f2ed0754d913dfaa6339a46d75711c53b44286d532fe6a0f0db6f1dbeaa6d2f723dc4a556b31c7c691e3f90c3
+SHA512 (xrootd-5.9.7.tar.gz) = f6a118a556b87881c821d32546e3a9d784578ffba99327821f0dec8de6b29360756cfd99bdc1adf4611490baee24bf9667657519be3a70efbd86345f9ed6a8a7

xrootd.spec

@@ -13,10 +13,10 @@
 
 Name:		xrootd
 Epoch:		1
-Version:	5.9.2
+Version:	5.9.7
 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
+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
 Source0:	%{url}/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:	%{name}-sysusers.conf
@@ -33,10 +33,12 @@ BuildRequires:	libxml2-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:	doxygen
-BuildRequires:	graphviz
 BuildRequires:	selinux-policy-devel
 BuildRequires:	systemd-rpm-macros
 BuildRequires:	systemd-devel
@@ -44,7 +46,6 @@ BuildRequires:	python3-devel
 BuildRequires:	python3-pip
 BuildRequires:	python3-setuptools
 BuildRequires:	python3-wheel
-BuildRequires:	python3-sphinx
 BuildRequires:	json-c-devel
 BuildRequires:	libmacaroons-devel
 BuildRequires:	libuuid-devel
@@ -59,11 +60,16 @@ BuildRequires:	libradosstriper-devel
 %ifnarch %{ix86}
 BuildRequires:	isa-l-devel
 %endif
+#		For documentation
+BuildRequires:	doxygen
+BuildRequires:	graphviz
+BuildRequires:	python3-sphinx
 #		For tests
 BuildRequires:	attr
 BuildRequires:	curl
 BuildRequires:	davix
 BuildRequires:	gtest-devel
+BuildRequires:	jq
 BuildRequires:	krb5-server
 BuildRequires:	krb5-workstation
 BuildRequires:	openssl
@@ -236,6 +242,7 @@ with HTTP repositories.
 %package ceph
 Summary:	XRootD plugin for interfacing with the Ceph storage platform
 Requires:	%{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:	%{name}-server-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description ceph
 The xrootd-ceph is an OSS layer plugin for the XRootD server for
@@ -261,6 +268,13 @@ This package contains the API documentation of the xrootd libraries.
 %prep
 %setup -q
 
+# Delete bundled dependencies
+rm src/XrdXml/tinyxml/tiny*
+%if %{?fedora}%{!?fedora:0}
+# picojson not in RHEL/EPEL
+rm -r src/XrdSciTokens/vendor/picojson
+%endif
+
 %build
 %cmake \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -318,6 +332,7 @@ 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
+
 mkdir -p %{buildroot}%{_sysusersdir}
 install -m 644 -p %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.conf
 
@@ -358,6 +373,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/config.d
 
 mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
 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 \
@@ -395,28 +411,10 @@ done
 
 touch testfile
 if ( setfattr -n user.testattr -v testvalue testfile ) ; then
-    %ctest -- -E XRootD::badredir
+    %ctest -- -E XRootD::badredir\|XrdCl::FileSystemTest.PlugInTest\|XrdCl::FileTest.PlugInTest
 else
     echo "Extended file attributes not supported by file system"
-    echo "Don't run tests that require them"
-    exclude="\
-XrdCl::FileCopyTest|\
-XrdCl::FileSystemTest.PlugInTest|\
-XrdCl::FileSystemTest.ServerQueryTest|\
-XrdCl::FileSystemTest.XAttrTest|\
-XrdCl::FileTest.XAttrTest|\
-XrdCl::LocalFileHandlerTest.XAttrTest|\
-XrdCl::ThreadingTest|\
-XrdCl::WorkflowTest.CheckpointTest|\
-XrdCl::WorkflowTest.XAttrWorkflowTest|\
-XrdEc::XrdEcTests|\
-XRootD::authenticated_cluster::test|\
-XRootD::badredir|\
-XRootD::cluster::test|\
-XRootD::http::test|\
-XRootD::posix::test|\
-XRootD::tpc::test"
-    %ctest -- -E $exclude
+    echo "*** NOT RUNNING TESTS ***"
 fi
 rm testfile
 
@@ -540,6 +538,7 @@ fi
 %{_libdir}/libXrdUtils.so
 %{_libdir}/libXrdXml.so
 %{_libdir}/cmake/XRootD
+%{_mandir}/man1/xrootd-config.1*
 
 %files client-libs
 %{_libdir}/libXrdCl.so.*
@@ -670,6 +669,18 @@ fi
 %doc %{_pkgdocdir}
 
 %changelog
+* Wed Aug 12 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.7-1
+- Update to version 5.9.7
+
+* Wed Jun 24 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.6-1
+- Update to version 5.9.6
+
+* Tue Jun 02 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.5-1
+- Update to version 5.9.5
+
+* Mon Jun 01 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.4-1
+- Update to version 5.9.4
+
 * Fri Mar 27 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.2-1
 - Update to version 5.9.2
 - Drop patches accepted upstream or previously backported