diff --git a/sources b/sources index 365f314..29f1174 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xrootd-4.11.3.tar.gz) = bc39d24c8f4699fd93b86db27dda6266057277f78d947502ec9dd31b87c2b1ed22022b16532003e89cc4d87be6b73d8523989fba3814ac810cfd234259c7a5b8 +SHA512 (xrootd-4.12.0.tar.gz) = 5338c4fb5461918473dd4f41f4d29fae09a8fc6a9e2d8f00bb74d929dc5396fef73643462d1a4f1ba71ffe5cf92a1695a167ca3a766c674a9377dcf99aaa1778 diff --git a/xrootd-man-xrdmapc.patch b/xrootd-man-xrdmapc.patch new file mode 100644 index 0000000..fceae94 --- /dev/null +++ b/xrootd-man-xrdmapc.patch @@ -0,0 +1,24 @@ +From ae7dd72f5605cd9dbdfff7ce5244faa02bca3893 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Mon, 23 Mar 2020 23:54:36 +0100 +Subject: [PATCH] Fix empty xrdmapc manpage + +--- + src/XrdCl/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/XrdCl/CMakeLists.txt b/src/XrdCl/CMakeLists.txt +index 181240337..759e7c171 100644 +--- a/src/XrdCl/CMakeLists.txt ++++ b/src/XrdCl/CMakeLists.txt +@@ -198,6 +198,7 @@ install( + FILES + ${PROJECT_SOURCE_DIR}/docs/man/xrdfs.1 + ${PROJECT_SOURCE_DIR}/docs/man/xrdcp.1 ++ ${PROJECT_SOURCE_DIR}/docs/man/xrdmapc.1 + DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 ) + + install( +-- +2.25.1 + diff --git a/xrootd.spec b/xrootd.spec index 0b6f5db..89dfb4d 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -24,13 +24,16 @@ Name: xrootd Epoch: 1 -Version: 4.11.3 -Release: 2%{?dist} +Version: 4.12.0 +Release: 1%{?dist} Summary: Extended ROOT file server License: LGPLv3+ URL: http://xrootd.org/ Source0: http://xrootd.org/download/v%{version}/%{name}-%{version}.tar.gz +# Fix empty xrdmapc manpage +# https://github.com/xrootd/xrootd/pull/1162 +Patch0: %{name}-man-xrdmapc.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -93,6 +96,7 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-client-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-server-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: expect +Requires: logrotate Requires(pre): shadow-utils %if %{use_systemd} %{?systemd_requires} @@ -259,6 +263,7 @@ This package contains the API documentation of the xrootd libraries. %prep %setup -q +%patch0 -p1 %build mkdir build @@ -502,27 +507,23 @@ fi %files server %{_bindir}/cconfig %{_bindir}/cmsd -%{_bindir}/cns_ssi %{_bindir}/frm_admin %{_bindir}/frm_purged %{_bindir}/frm_xfragent %{_bindir}/frm_xfrd %{_bindir}/mpxstats %{_bindir}/wait41 -%{_bindir}/XrdCnsd %{_bindir}/xrdacctest %{_bindir}/xrdpfc_print %{_bindir}/xrdpwdadmin %{_bindir}/xrdsssadmin %{_bindir}/xrootd %{_mandir}/man8/cmsd.8* -%{_mandir}/man8/cns_ssi.8* %{_mandir}/man8/frm_admin.8* %{_mandir}/man8/frm_purged.8* %{_mandir}/man8/frm_xfragent.8* %{_mandir}/man8/frm_xfrd.8* %{_mandir}/man8/mpxstats.8* -%{_mandir}/man8/XrdCnsd.8* %{_mandir}/man8/xrdpfc_print.8* %{_mandir}/man8/xrdpwdadmin.8* %{_mandir}/man8/xrdsssadmin.8* @@ -694,6 +695,10 @@ fi %doc %{_pkgdocdir} %changelog +* Fri May 08 2020 Mattias Ellert - 1:4.12.0-1 +- Update to version 4.12.0 +- Fix empty xrdmapc manpage + * Tue Apr 21 2020 Björn Esser - 1:4.11.3-2 - Rebuild (json-c)