Merge pull request #7233 from mrodozov/update-xrootd-531

XrootD - backport 531 from devel to master
cms-sw · Jan 11, 2022 · 7a05479 · 7a05479
2 parents efec907 + 754c7f0
commit 7a05479
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/libunwind.spec b/libunwind.spec
@@ -17,4 +17,4 @@ make %{makeprocesses}
 
 make %{makeprocesses} install
 [ -d %{i}/lib64 ] && mv %{i}/lib64 %{i}/lib
-%define drop_files %{i}/share/man %{i}/lib/pkgconfig %{i}/lib/*.a
+%define drop_files %{i}/share/man %{i}/lib/pkgconfig %{i}/lib/*.a
diff --git a/scram-tools.file/tools/xrootd/xrootd.xml b/scram-tools.file/tools/xrootd/xrootd.xml
@@ -1,6 +1,6 @@
 <tool name="xrootd" version="@TOOL_VERSION@">
   <lib name="XrdUtils"/>
-  <lib name="XrdClient"/>
+  <lib name="XrdCl"/>
   <client>
     <environment name="XROOTD_BASE" default="@TOOL_ROOT@"/>
     <environment name="INCLUDE" default="$XROOTD_BASE/include/xrootd"/>

diff --git a/xrootd.spec b/xrootd.spec
@@ -1,9 +1,9 @@
-### RPM external xrootd 4.12.3
+### RPM external xrootd 5.3.1
 ## INITENV +PATH LD_LIBRARY_PATH %i/lib64
 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
 
-%define tag b122d662f80a46a570876afd32cdaa9f4370dc1d
-%define branch stable-4.12.x
+%define tag v%{realversion}
+%define branch stable-5.3.x
 %define github_user xrootd
 Source: git+https://github.com/%github_user/xrootd.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz