Skip to content

Commit c285514

Browse files
authored
Fix RPM-based builds (#88)
Revamp spec file for 0.2.1 release.
1 parent 7fcb352 commit c285514

File tree

1 file changed

+23
-22
lines changed

1 file changed

+23
-22
lines changed

rpm/xrootd-s3-http.spec

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
1-
Name: xrootd-s3-http
2-
Version: 0.0.2
3-
Release: 1%{?dist}
4-
Summary: S3/HTTP filesystem plugins for xrootd
5-
6-
Group: System Environment/Daemons
7-
License: BSD
8-
# Generated from:
9-
# git archive v%{version} --prefix=xrootd-s3-http-%{version}/ | gzip -7 > ~/rpmbuild/SOURCES/xrootd-s3-http-%{version}.tar.gz
10-
URL: https://github.com/pelicanplatform/xrootd-s3-http
11-
Source0: %{name}-%{version}.tar.gz
1+
Name: xrootd-s3-http
2+
Version: 0.2.1
3+
Release: 1%{?dist}
4+
Summary: S3/HTTP filesystem plugins for xrootd
5+
6+
License: Apache-2.0
7+
URL: https://github.com/PelicanPlatform/%{name}
8+
Source0: %{url}/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz
129

1310
%define xrootd_current_major 5
14-
%define xrootd_current_minor 5
11+
%define xrootd_current_minor 7
1512
%define xrootd_next_major 6
1613

17-
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
14+
BuildRequires: cmake3
15+
BuildRequires: gcc-c++
16+
BuildRequires: make
1817
BuildRequires: xrootd-server-libs >= 1:%{xrootd_current_major}
1918
BuildRequires: xrootd-server-libs < 1:%{xrootd_next_major}
2019
BuildRequires: xrootd-server-devel >= 1:%{xrootd_current_major}
2120
BuildRequires: xrootd-server-devel < 1:%{xrootd_next_major}
22-
BuildRequires: cmake3
23-
BuildRequires: gcc-c++
2421
BuildRequires: libcurl-devel
2522
BuildRequires: openssl-devel
23+
BuildRequires: tinyxml2-devel
2624

2725
Requires: xrootd-server >= 1:%{xrootd_current_major}.%{xrootd_current_minor}
2826
Requires: xrootd-server < 1:%{xrootd_next_major}.0.0-1
@@ -34,19 +32,22 @@ Requires: xrootd-server < 1:%{xrootd_next_major}.0.0-1
3432
%setup -q
3533

3634
%build
37-
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
38-
make VERBOSE=1 %{?_smp_mflags}
35+
%cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DXROOTD_EXTERNAL_TINYXML2=ON
36+
cmake --build redhat-linux-build --verbose
3937

4038
%install
41-
rm -rf $RPM_BUILD_ROOT
42-
make install DESTDIR=$RPM_BUILD_ROOT
39+
%cmake_install
4340

4441
%files
45-
%defattr(-,root,root,-)
46-
%{_libdir}/libXrdS3*.so
47-
%{_libdir}/libXrdHTTPServer*.so
42+
%{_libdir}/libXrdHTTPServer-5.so
43+
%{_libdir}/libXrdS3-5.so
44+
%doc README.md
45+
%license LICENSE
4846

4947
%changelog
48+
* Sat Feb 1 2025 Brian Bockelman <bbockelman@morgridge.org> - 0.2.1-1
49+
- Bump to upstream version 0.2.1.
50+
5051
* Tue Nov 28 2023 Justin Hiemstra <jhiemstra@wisc.edu> - 0.0.2-1
5152
- Add HTTPServer plugin
5253

0 commit comments

Comments
 (0)