Skip to content

Commit fe9d30b

Browse files
authored
Merge pull request #10562 from akritkbehera/Update-XRootD-to-6.01
[DEVEL] Update xrootd version to latest release 6.0.1
2 parents aa30bb5 + fe8af06 commit fe9d30b

2 files changed

Lines changed: 28 additions & 3 deletions

File tree

libzip.spec

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
### RPM external libzip 1.11.4
2+
Source: https://github.com/nih-at/libzip/releases/download/v%{realversion}/libzip-%{realversion}.tar.gz
3+
BuildRequires: cmake
4+
Requires: zlib zstd
5+
Requires: bz2lib
6+
7+
%prep
8+
%setup -n %{n}-%{realversion}
9+
10+
%build
11+
cmake \
12+
-S %{_builddir}/%{n}-%{realversion} \
13+
-B %{_builddir}/build \
14+
-DCMAKE_INSTALL_PREFIX=%{i} \
15+
-DCMAKE_PREFIX_PATH=%{cmake_prefix_path} \
16+
-DENABLE_COMMONCRYPTO=OFF \
17+
-DENABLE_GNUTLS=OFF \
18+
-DENABLE_MBEDTLS=OFF \
19+
-DENABLE_WINDOWS_CRYPTO=OFF \
20+
-DBUILD_EXAMPLES=OFF \
21+
-DBUILD_DOC=OFF
22+
23+
make -C %{_builddir}/build %{makeprocesses}
24+
%install
25+
make -C %{_builddir}/build %{makeprocesses} install

xrootd.spec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### RPM external xrootd 5.9.4
1+
### RPM external xrootd 6.0.1
22
## INITENV +PATH LD_LIBRARY_PATH %i/lib64
33
## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
44

@@ -8,7 +8,7 @@
88
%define github_user xrootd
99
Source: https://github.com/xrootd/xrootd/releases/download/v%{realversion}/%{n}-%{realversion}.tar.gz
1010

11-
BuildRequires: cmake gmake autotools py3-pip
11+
BuildRequires: cmake gmake autotools py3-pip libzip
1212
Requires: zlib libuuid curl davix
1313
Requires: python3 py3-setuptools
1414
Requires: libxml2
@@ -56,7 +56,7 @@ cmake ../%n-%{realversion} \
5656
-DENABLE_XRDEC=TRUE \
5757
-DCMAKE_CXX_FLAGS="-I${LIBUUID_ROOT}/include" \
5858
-DCMAKE_SHARED_LINKER_FLAGS="-L${LIBUUID_ROOT}/lib64" \
59-
-DCMAKE_PREFIX_PATH="%{cmake_prefix_path}"
59+
-DCMAKE_PREFIX_PATH="%{cmake_prefix_path};$LIBZIP_ROOT"
6060

6161
make %makeprocesses VERBOSE=1
6262

0 commit comments

Comments
 (0)