update to 3.2 (#1956027)

.gitignore

@@ -2,3 +2,5 @@
 /utfcpp-2.3.6.tar.gz
 /utfcpp-3.1.tar.gz
 /utfcpp-3.1.2.tar.gz
+/ftest-9c7e60c.tar.gz
+/utfcpp-3.2.tar.gz

sources

@@ -1 +1,2 @@
-SHA512 (utfcpp-3.1.2.tar.gz) = d43df19d9e8652291f1301a326ec0d592bad43d6ecf9086947037f0ae0c1e70c2d96082c48066639e2b7c57c0ea0e4782d6b215d017cf96a4c73ff3a15feec75
+SHA512 (ftest-9c7e60c.tar.gz) = c57ec5e88ce61dee9e751595e9a57e03f655e78d7dca0e7a6b4f4f63acb49197676f31a8bd5ea698207c4a4665ccc1bc810b6ec715dec3b69a48a85a8ce224d0
+SHA512 (utfcpp-3.2.tar.gz) = 7e6d3d002630118d21bbbf6b6b11a3cdc7082ff7cbf4f2b81e7cf2171d4a000c1d033b733a735437f1fa05172572ba18926cd52cc437f585d5e19bd032fbc8a0

utf8cpp-use-system-gtest.patch

@@ -1,32 +0,0 @@
-diff -up utfcpp-3.1/CMakeLists.txt.gtest utfcpp-3.1/CMakeLists.txt
---- utfcpp-3.1/CMakeLists.txt.gtest	2019-04-26 23:49:17.000000000 +0200
-+++ utfcpp-3.1/CMakeLists.txt	2019-10-22 09:44:02.721256016 +0200
-@@ -32,6 +32,5 @@ endif()
- 
- if(UTF8_TESTS)
-     enable_testing()
--    add_subdirectory(extern/gtest)
-     add_subdirectory(tests)
- endif()
-diff -up utfcpp-3.1/tests/CMakeLists.txt.gtest utfcpp-3.1/tests/CMakeLists.txt
---- utfcpp-3.1/tests/CMakeLists.txt.gtest	2019-04-26 23:49:17.000000000 +0200
-+++ utfcpp-3.1/tests/CMakeLists.txt	2019-10-22 09:46:24.165698530 +0200
-@@ -16,15 +16,18 @@ target_link_libraries(negative PRIVATE u
- target_link_libraries(cpp11 PRIVATE
-     utf8::cpp
-     gtest_main
-+    gtest
-     )
- target_link_libraries(apitests PRIVATE
-     utf8::cpp
-     gtest_main
-+    gtest
- )
- 
- target_link_libraries(noexceptionstests PRIVATE
-     utf8::cpp
-     gtest_main
-+    gtest
- )
- target_compile_options(noexceptionstests PUBLIC -fno-exceptions)
- 

utf8cpp.spec

@@ -1,20 +1,21 @@
 %undefine __cmake_in_source_build
 # This package only contains header files.
 %global debug_package %{nil}
+%global ftest_commit 9c7e60cc1b7c76f59e2ffbbc3dad15bafc5cdac5
+%global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7})
 
 Name:       utf8cpp
-Version:    3.1.2
-Release:    2%{?dist}
+Version:    3.2
+Release:    1%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    Boost
 URL:        https://github.com/nemtrif/utfcpp
 Source0:    https://github.com/nemtrif/utfcpp/archive/v%{version}/utfcpp-%{version}.tar.gz
-Patch0:     %{name}-use-system-gtest.patch
+Source1:    https://github.com/nemtrif/ftest/archive/%{ftest_commit}/ftest-%{ftest_shortcommit}.tar.gz
 # put cmake import file in arch-agnostic directory
 Patch1:     %{name}-noarch.patch
 BuildRequires: cmake3
 BuildRequires: gcc-c++
-BuildRequires: gtest-devel
 
 %description
 %{summary}.
@@ -45,8 +46,8 @@ This project currently only contains header files, which can be found in the
 %{name}-devel package.
 
 %prep
-%setup -q -n utfcpp-%{version}
-%patch0 -p1 -b .gtest
+%setup -q -n utfcpp-%{version} -a1
+rmdir extern/ftest && mv ftest-%{ftest_commit} extern/ftest
 %patch1 -p1 -b .noarch
 #%%patch10 -p1
 
@@ -82,6 +83,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Tue May 04 2021 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 3.2-1
+- update to 3.2 (#1956027)
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild