Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XrootD - backport 531 from devel to master #7233

Merged
merged 4 commits into from Jan 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion libunwind.spec
Expand Up @@ -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
2 changes: 1 addition & 1 deletion 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"/>
Expand Down
6 changes: 3 additions & 3 deletions 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

Expand Down