From a5616387c23126d565a7109dfb0520524d0ed718 Mon Sep 17 00:00:00 2001
From: Mihai Patrascoiu <mihai.patrascoiu@cern.ch>
Date: Aug 08 2023 08:46:50 +0000
Subject: Upgrade to upstream release 2.21.5


---

diff --git a/0001_FindCryptopp_32bit_architectures.patch b/0001_FindCryptopp_32bit_architectures.patch
deleted file mode 100644
index caece6b..0000000
--- a/0001_FindCryptopp_32bit_architectures.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/cmake/modules/FindCryptopp.cmake b/cmake/modules/FindCryptopp.cmake
-index 815d3810..550d7386 100644
---- a/cmake/modules/FindCryptopp.cmake
-+++ b/cmake/modules/FindCryptopp.cmake
-@@ -16,21 +16,35 @@
- 
- # This code sets the following variables:
- #
--# CRYPTOPP_LIBRARIES       = full path to the crytopp libraries
--# CRYPTOPP_INCLUDE_DIRS    = include dir to be used when using the crytopp library
--# CRYPTOPP_FOUND           = set to true if crytopp was found successfully
-+# CRYPTOPP_LIBRARIES       = full path to the cryptopp libraries
-+# CRYPTOPP_INCLUDE_DIRS    = include dir to be used when using the cryptopp library
-+# CRYPTOPP_FOUND           = set to true if cryptopp was found successfully
- 
-+# -----------------------------------------------------
-+# Cryptopp Libraries
-+# -----------------------------------------------------
-+find_library(CRYPTOPP_LIBRARIES
-+    NAMES cryptopp
-+    HINTS ${CRYPTOPP_LOCATION}
-+          /lib /lib64 /usr/lib /usr/lib64
-+    DOC "The cryptopp library"
-+)
- 
-+# -----------------------------------------------------
-+# Cryptopp Include Directories
-+# -----------------------------------------------------
- find_path(CRYPTOPP_INCLUDE_DIRS
--        base64.h
--        PATHS /usr/include/cryptopp
--        NO_DEFAULT_PATH)
--
--find_library(CRYPTOPP_LIBRARIES
--        NAME cryptopp
--        PATHS /usr/lib64
--        NO_DEFAULT_PATH)
-+    NAMES base64.h                # header for base64 encoding, not processor architecture
-+    HINTS ${CRYPTOPP_LOCATION}
-+          /usr/include/cryptopp
-+    DOC "The cryptopp headers"
-+)
- 
-+# -------------------------------------------------------------------
-+# Handle the QUIETLY and REQUIRED arguments
-+# and set CRYPTOPP to TRUE if all listed variables are TRUE
-+# -------------------------------------------------------------------
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(cryptopp DEFAULT_MSG
--        CRYPTOPP_INCLUDE_DIRS CRYPTOPP_LIBRARIES)
-+    CRYPTOPP_LIBRARIES CRYPTOPP_INCLUDE_DIRS)
-+mark_as_advanced(CRYPTOPP_LIBRARIES CRYPTOPP_INCLUDE_DIRS)
diff --git a/gfal2.spec b/gfal2.spec
index 72bd9bb..c548924 100644
--- a/gfal2.spec
+++ b/gfal2.spec
@@ -5,23 +5,18 @@
 %bcond_with tests
 
 Name:               gfal2
-Version:            2.21.4
-Release:            3%{?dist}
+Version:            2.21.5
+Release:            1%{?dist}
 Summary:            Grid file access library 2.0
 License:            ASL 2.0
 URL:                https://dmc-docs.web.cern.ch/dmc-docs/gfal2/gfal2.html
-# git clone --depth=1 --branch master https://gitlab.cern.ch/dmc/gfal2.git gfal2-2.21.4
-# pushd gfal2-2.21.4
-# git checkout v2.21.4
+# git clone --depth=1 --branch master https://gitlab.cern.ch/dmc/gfal2.git gfal2-2.21.5
+# pushd gfal2-2.21.5
+# git checkout v2.21.5
 # popd
-# tar czf gfal2-2.21.4.tar.gz --exclude-vcs gfal2-2.21.4
+# tar czf gfal2-2.21.5.tar.gz --exclude-vcs gfal2-2.21.5
 Source0:            %{name}-%{version}.tar.gz
 
-# Allow compiling on 32-bit architectures by correctly finding
-# the cryptopp library and header files.
-# (change ported from upstream)
-Patch0:             0001_FindCryptopp_32bit_architectures.patch
-
 #main lib dependencies
 BuildRequires:      gcc-c++
 BuildRequires:      cmake3
@@ -221,7 +216,7 @@ gfal2 tests
 %cmake3_build --target clean
 
 %prep
-%autosetup -p1
+%autosetup
 
 %build
 # Make sure the version in the spec file and the version used
@@ -346,6 +341,9 @@ fi
 
 
 %changelog
+* Tue Aug 08 2023 Mihai Patrascoiu <mihai.patrascoiu@cern.ch> - 2.21.5-1
+- Upgrade to upstream release 2.21.5
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.21.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index f0d1b25..6a98b3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gfal2-2.21.4.tar.gz) = 35c5ff72c9a2930b044690965414b9ceadbcfbc53518ac89e464d0e81c9c2a3524bded1f67e217f9ceaf731a21b86f2a39b9d83c56755e835044b5bc397903b6
+SHA512 (gfal2-2.21.5.tar.gz) = 86526d2c84df3ec1f3a1b50f25a064fd8ed9cad95c394bbebbd721e719d68b18bf1d69fbcc04a12da72b10dd00c03c7237efbc46c67cd108fd180b1f955329c3