From 225a4370ba2ef0254b8959a8dade4e7de0dcbe34 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Tue, 24 Aug 2021 08:51:11 +0200 Subject: [PATCH 1/3] XrootD - backport 531 from devel to master --- scram-tools.file/tools/xrootd/xrootd.xml | 2 +- xrootd.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scram-tools.file/tools/xrootd/xrootd.xml b/scram-tools.file/tools/xrootd/xrootd.xml index 4d898c7e2ba..e54184aef2a 100644 --- a/scram-tools.file/tools/xrootd/xrootd.xml +++ b/scram-tools.file/tools/xrootd/xrootd.xml @@ -1,6 +1,6 @@ - + diff --git a/xrootd.spec b/xrootd.spec index 0ef24d0f013..708248f34e0 100644 --- 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 From f8cd10303da60bb6d8cf538d54e49188a8cd22f3 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 4 Oct 2021 15:11:09 +0200 Subject: [PATCH 2/3] Update libunwind.spec --- libunwind.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libunwind.spec b/libunwind.spec index 66d621a6b46..ed18d4a7774 100644 --- a/libunwind.spec +++ b/libunwind.spec @@ -19,5 +19,5 @@ make %{makeprocesses} %install make %{makeprocesses} install - +[ -d %{i}/lib64 ] && mv %{i}/lib64 %{i}/lib %define drop_files %{i}/share/man %{i}/lib/pkgconfig %{i}/lib/*.a From 85e626a67d7dcbfd1d94e61b1a7c6f5c17ce19ae Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Fri, 17 Dec 2021 10:30:13 +0100 Subject: [PATCH 3/3] Update libunwind.spec --- libunwind.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libunwind.spec b/libunwind.spec index ed18d4a7774..b545d084b5d 100644 --- a/libunwind.spec +++ b/libunwind.spec @@ -19,5 +19,6 @@ make %{makeprocesses} %install make %{makeprocesses} install + [ -d %{i}/lib64 ] && mv %{i}/lib64 %{i}/lib %define drop_files %{i}/share/man %{i}/lib/pkgconfig %{i}/lib/*.a