From 51c097229aa4f614bdb8088f808bfe75a470b28f Mon Sep 17 00:00:00 2001
From: Mihai Patrascoiu <mihai.patrascoiu@cern.ch>
Date: Mar 04 2022 18:49:55 +0000
Subject: Merge branch 'main' into epel8


---

diff --git a/gfal2.spec b/gfal2.spec
index b77f036..25cc023 100644
--- a/gfal2.spec
+++ b/gfal2.spec
@@ -4,12 +4,8 @@
 # Require --with=tests in order to build functional tests
 %bcond_with tests
 
-%if %{?fedora}%{!?fedora:0} < 35
-  %define _with_srm 1
-%endif
-
 Name:               gfal2
-Version:            2.20.4
+Version:            2.20.5
 Release:            1%{?dist}
 Summary:            Grid file access library 2.0
 License:            ASL 2.0
@@ -41,9 +37,7 @@ BuildRequires:      lfc-devel
 BuildRequires:      dpm-devel
 %endif
 #srm plugin dependencies
-%if %{?_with_srm:1}%{?!_with_srm:0}
 BuildRequires:      srm-ifce-devel >= 1.23.1
-%endif
 #dcap plugin dependencies
 BuildRequires:      dcap-devel
 #gridftp plugin dependencies
@@ -128,7 +122,6 @@ Provides the dcap support (gsidcap://, dcap://) for %{name}.
 The dcap plugin provides the POSIX operations for the dcap \
 URLs, the dcap protocol is used on the DCACHE storage system
 
-%if %{?_with_srm:1}%{?!_with_srm:0}
 %package plugin-srm
 Summary:            Provides the srm access for %{name}
 Requires:           %{name}%{?_isa} = %{version}-%{release} 
@@ -138,7 +131,6 @@ Requires:           srm-ifce >= 1.23.1
 Provides the srm support (srm://) for %{name}. 
 The srm plugin provides the POSIX operations and 
 the third party transfer support on the SRM URLs.
-%endif
 
 %package plugin-gridftp
 Summary:            Provides the gridftp support for %{name}
@@ -198,9 +190,7 @@ Requires:           %{name}-plugin-lfc%{?_isa} = %{version}-%{release}
 Requires:           %{name}-plugin-rfio%{?_isa} = %{version}-%{release}
 %endif
 Requires:           %{name}-plugin-dcap%{?_isa} = %{version}-%{release}
-%if %{?_with_srm:1}%{?!_with_srm:0}
 Requires:           %{name}-plugin-srm%{?_isa} = %{version}-%{release}
-%endif
 Requires:           %{name}-plugin-gridftp%{?_isa} = %{version}-%{release}
 Requires:           %{name}-plugin-http%{?_isa} = %{version}-%{release}
 Requires:           %{name}-plugin-xrootd%{?_isa} = %{version}-%{release}
@@ -245,7 +235,6 @@ fi
 %cmake3 \
     -DDOC_INSTALL_DIR=%{_pkgdocdir} \
     -DUNIT_TESTS=TRUE \
-    -DPLUGIN_SRM=%{?_with_srm:TRUE}%{?!_with_srm:FALSE} \
     -DPLUGIN_MOCK=TRUE \
     -DPLUGIN_LFC=FALSE \
     -DPLUGIN_RFIO=FALSE \
@@ -310,12 +299,10 @@ fi
 %{_pkgdocdir}/README_PLUGIN_DCAP
 %config(noreplace) %{_sysconfdir}/%{name}.d/dcap_plugin.conf
 
-%if %{?_with_srm:1}%{?!_with_srm:0}
 %files plugin-srm
 %{_libdir}/%{name}-plugins/libgfal_plugin_srm.so*
 %{_pkgdocdir}/README_PLUGIN_SRM
 %config(noreplace) %{_sysconfdir}/%{name}.d/srm_plugin.conf
-%endif
 
 %files plugin-gridftp
 %{_libdir}/%{name}-plugins/libgfal_plugin_gridftp.so*
@@ -350,6 +337,9 @@ fi
 
 
 %changelog
+* Fri Mar 04 2022 Mihai Patrascoiu <miha.patrascoiu@cern.ch> - 2.20.5-1
+- Upgrade to upstream release 2.20.5
+
 * Tue Mar 01 2022 Mihai Patrascoiu <miha.patrascoiu@cern.ch> - 2.20.4-1
 - Upgrade to upstream release 2.20.4
 
diff --git a/sources b/sources
index b3b1348..f8adf61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gfal2-2.20.4.tar.gz) = 63713af5cd10b2119b4d0447ea905873e680e6cb31bf428fec234af38c019c9e9480a7ff66e27331ada44e534f3e6d72b90d4602813f5d25fbcc337765a1ea39
+SHA512 (gfal2-2.20.5.tar.gz) = fa62d2a526fff5049e4e1a4b41e91c66af359b4c3bf6492ea28b730c987081592786b46440546fea065cad456ac04ddce28a502572ccf42893918cec9dad836b