From 1ee1aa8f97dbf6893ab04ce8e87d32e36a389d34 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Sep 10 2021 08:35:09 +0000
Subject: Import leatherman-1.12.6-3.el9 in CloudSIG xena


---

diff --git a/.leatherman.metadata b/.leatherman.metadata
index 9e91aef..d24ee34 100644
--- a/.leatherman.metadata
+++ b/.leatherman.metadata
@@ -1 +1 @@
-bb7b47d1a5c1b4620599e6e8f6876e4db45328f0  SOURCES/leatherman-1.12.0.tar.gz
+84a777a39281c454a92aea9afca06be86f618384  SOURCES/leatherman-1.12.6.tar.gz
diff --git a/SPECS/leatherman.spec b/SPECS/leatherman.spec
index 03fd1d3..3f7c7c7 100644
--- a/SPECS/leatherman.spec
+++ b/SPECS/leatherman.spec
@@ -1,6 +1,6 @@
 Name:           leatherman
-Version:        1.12.0
-Release:        6%{?dist}
+Version:        1.12.6
+Release:        3%{?dist}
 Summary:        Collection of C++ and CMake utility libraries
 
 # leatherman is ASL 2.0
@@ -11,10 +11,8 @@ Source:         %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 # This unbundles boost-nowide and the boost libraries do not need
 # to have the path to nowide added as it's included already
-Patch0:         shared_nowide.patch
-# Add missing include for <stdexcept>, no longer indirectly included in GCC 10
-Patch1:         leatherman-gcc10.patch
-# Similar for cstddef and gcc-11
+Patch0:         leatherman-1.12.4-shared_nowide.patch
+Patch1:         system-catch.patch
 Patch2:         %{name}-gcc11.patch
 
 BuildRequires:  cmake >= 3.2.2
@@ -23,6 +21,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  boost-devel >= 1.73
 BuildRequires:  libcurl-devel
 BuildRequires:  gettext
+BuildRequires:  catch1-devel
 Provides:       bundled(rapidjson) = 1.0.2
 
 %description
@@ -53,6 +52,7 @@ sed -i -e "s/\s*-Werror\s*//g" cmake/cflags.cmake
 %cmake . -B%{_target_platform} \
   -DLEATHERMAN_SHARED=ON \
   -DLEATHERMAN_DEBUG=ON \
+  -DLEATHERMAN_CATCH_INCLUDE=%{_includedir}/catch \
   %{nil}
 %make_build -C %{_target_platform}
 
@@ -74,6 +74,24 @@ sed -i -e "s/\s*-Werror\s*//g" cmake/cflags.cmake
 %{_libdir}/cmake/%{name}/
 
 %changelog
+* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 1.12.6-3
+- Rebuilt for Boost 1.76
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jul 13 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.12.6-1
+- 1.12.6
+
+* Fri Jun 11 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.12.5-1
+- 1.12.5
+
+* Thu Mar 18 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.12.4-2
+- Link leatherman_util against boost_nowide.
+
+* Tue Mar 09 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.12.4-1
+- 1.12.4
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild