From ab1782377a8e1db0c88d2197452dd3e17d3e43d3 Mon Sep 17 00:00:00 2001
From: Mihai Patrascoiu <mihai.patrascoiu@cern.ch>
Date: Mar 07 2022 15:15:52 +0000
Subject: Merge branch 'main' into epel8


---

diff --git a/gfal2-util.spec b/gfal2-util.spec
index 5f9bc55..a391e0c 100644
--- a/gfal2-util.spec
+++ b/gfal2-util.spec
@@ -5,8 +5,8 @@
 # Require --without=python3 in order to disable python3 build package
 %bcond_without python3
 
-# Require --without=python2 in order to disable python2 build package on Fedora < 29 or RHEL<8
-%if (0%{?fedora} && 0%{?fedora} < 29) || (0%{?rhel} && 0%{?rhel} < 8)
+# Require --without=python2 in order to disable python2 build package on RHEL7
+%if 0%{?rhel} == 7
 %bcond_without python2
 %endif
 
@@ -19,17 +19,17 @@
 %endif
 
 Name:           gfal2-util
-Version:        1.6.0
-Release:        7%{?dist}
+Version:        1.7.1
+Release:        1%{?dist}
 Summary:        GFAL2 utility tools
 Group:          Applications/Internet
 License:        GPLv3
 URL:            http://dmc.web.cern.ch/
-# git clone https://gitlab.cern.ch/dmc/gfal2-util.git gfal2-util-1.5.1 --depth=1
-# pushd gfal2-util-1.5.1
-# git checkout v1.5.1
+# git clone https://gitlab.cern.ch/dmc/gfal2-util.git gfal2-util-1.7.0 --depth=1
+# pushd gfal2-util-1.7.0
+# git checkout v1.7.0
 # popd
-# tar czf gfal2-util-1.5.1.tar.gz --exclude-vcs gfal2-util-1.5.1
+# tar czf gfal2-util-1.7.0.tar.gz --exclude-vcs gfal2-util-1.7.0
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -38,10 +38,10 @@ BuildArch:      noarch
 BuildRequires:  gfal2-core
 BuildRequires:  gfal2-plugin-file
 
-%global _description\
-gfal2-util is a set of basic utility tools for file\
-interactions and file copy based on the GFAL 2.0 toolkit.\
-gfal2-util supports the protocols of GFAL 2.0 : WebDav(s),\
+%global _description \
+gfal2-util is a set of basic utility tools for file \
+interactions and file copy based on the GFAL 2.0 toolkit. \
+gfal2-util supports the protocols of GFAL 2.0 : WebDav(s), \
 gridFTP, http(s), SRM, xrootd, etc...
 
 %description %_description
@@ -87,7 +87,7 @@ rm -rf %{buildroot}
 # Gfal2-util-scripts package
 #-------------------------------------------------------------------------------
 %package scripts
-Summary: gfal2 command line scripts
+Summary:        gfal2 command line scripts
 
 %description scripts
 Provides a set of command line scripts to call gfal2-util python functions.
@@ -102,24 +102,21 @@ Provides a set of command line scripts to call gfal2-util python functions.
 #-------------------------------------------------------------------------------
 %if 0%{with python2}
 %package -n python2-gfal2-util
-Summary: gfal2 clients for python2
-
-BuildRequires: python2-gfal2 >= 1.9.0
-BuildRequires: python2
-BuildRequires: python2-rpm-macros
-BuildRequires: python2-future
-Requires:      python2-gfal2 >= 1.9.0
-Requires:      gfal2-util-scripts = %{version}-%{release}
-Requires:      gfal2-plugin-file
-Requires:      python2
-Requires:      python2-future
-%if (0%{?fedora} && 0%{?fedora} < 26) || (0%{?rhel} && 0%{?rhel} < 7)
-BuildRequires: python-argparse
-Requires:      python-argparse
-%endif
+Summary:        gfal2 clients for python2
+
+BuildRequires:  gfal2-python >= 1.11.0
+BuildRequires:  python2
+BuildRequires:  python2-rpm-macros
+BuildRequires:  python2-future
+Requires:       gfal2-python >= 1.11.0
+Requires:       gfal2-util-scripts = %{version}-%{release}
+Requires:       gfal2-plugin-file
+Requires:       python2
+Requires:       python2-future
 
-Provides: gfal2-util = %{version}-%{release}
-Obsoletes: gfal2-util < %{version}-%{release}
+# Introduced in v1.6.0 / Remove around FC36
+Provides:       gfal2-util = %{version}-%{release}
+Obsoletes:      gfal2-util < %{version}-%{release}
 
 %description -n python2-gfal2-util %_description
 
@@ -134,15 +131,15 @@ Obsoletes: gfal2-util < %{version}-%{release}
 #-------------------------------------------------------------------------------
 %if 0%{with python3}
 %package -n python3-gfal2-util
-Summary: gfal2 clients for python3
+Summary:        gfal2 clients for python3
 
-BuildRequires: python3-gfal2 >= 1.9.0
-BuildRequires: python3
-BuildRequires: python3-rpm-macros
-Requires:      python3-gfal2 >= 1.9.0
-Requires:      gfal2-util-scripts = %{version}-%{release}
-Requires:      gfal2-plugin-file
-Requires:      python3
+BuildRequires:  gfal2-python3 >= 1.11.0
+BuildRequires:  python3
+BuildRequires:  python3-rpm-macros
+Requires:       gfal2-python3 >= 1.11.0
+Requires:       gfal2-util-scripts = %{version}-%{release}
+Requires:       gfal2-plugin-file
+Requires:       python3
 
 # EL7 upgrade path is for python2-gfal2-util
 %if 0%{?rhel} != 7
@@ -161,6 +158,12 @@ Obsoletes:      gfal2-util < %{version}-%{release}
 %endif
 
 %changelog
+* Mon Mar 07 2022 Mihai Patrascoiu <mipatras@cern.ch> - 1.7.1-1
+- Upgrade to upstream release 1.7.1
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Tue Oct 20 2021 Michal Simon <michal.simon@cern.ch> - 1.6.0-7
 - Add provides/obsoletes for the python3 package.
 
@@ -214,4 +217,4 @@ Obsoletes:      gfal2-util < %{version}-%{release}
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
 * Mon Nov 04 2013 Adrien Devresse <adevress at cern.ch> - 0.2.1-1
- - Initial EPEL compatible version
+- Initial EPEL compatible version
diff --git a/sources b/sources
index 65a815f..ebe440e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gfal2-util-1.6.0.tar.gz) = 5a48aa54c989f89e6519fd96f9bca33d43f3c94604fb7056076e9902fd18db14b5708222bbb50f4ddd648d0a214b15ad9a52b65bcee3d41686d4e8116e047670
+SHA512 (gfal2-util-1.7.1.tar.gz) = 1b4e650934cdc0245fe23490c5b21185458f9f48c845bc46bd00025333395610f6e59f00df84ac0771ffd476194f9b645ee5b300604fd5eb2ce0849116507c58