From b82814892df736053d02b6d2ab40a7c55d5bf7e0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 16:51:37 +0000
Subject: [PATCH 01/42] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index fa28e77..5af2d06 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -3,7 +3,7 @@
 
 Name:       utf8cpp
 Version:    2.3.4
-Release:    7%{?dist}
+Release:    8%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 
 Group:      Development/Libraries
@@ -68,6 +68,9 @@ done
 
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From f127227a0194b7bf0695473b08f97b8ace4de366 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 21:06:37 +0000
Subject: [PATCH 02/42] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 5af2d06..0dea6dc 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -3,7 +3,7 @@
 
 Name:       utf8cpp
 Version:    2.3.4
-Release:    8%{?dist}
+Release:    9%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 
 Group:      Development/Libraries
@@ -68,6 +68,9 @@ done
 
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 14008566572641d5fca151acdfd670a83aa0d702 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 20:12:55 +0000
Subject: [PATCH 03/42] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 0dea6dc..9fcc1b7 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -3,7 +3,7 @@
 
 Name:       utf8cpp
 Version:    2.3.4
-Release:    9%{?dist}
+Release:    10%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 
 Group:      Development/Libraries
@@ -68,6 +68,9 @@ done
 
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 0a38c2d279921559fcb90f7560243199b19ef4ec Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 08:21:17 +0000
Subject: [PATCH 04/42] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 9fcc1b7..3462f16 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -3,7 +3,7 @@
 
 Name:       utf8cpp
 Version:    2.3.4
-Release:    10%{?dist}
+Release:    11%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 
 Group:      Development/Libraries
@@ -68,6 +68,9 @@ done
 
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From aec42fc7789cfa16dc9dd156f00c81d1475804ab Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:18:29 +0100
Subject: [PATCH 05/42] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 utf8cpp.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 3462f16..356207f 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -6,7 +6,6 @@ Version:    2.3.4
 Release:    11%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 
-Group:      Development/Libraries
 License:    Boost
 URL:        http://utfcpp.sourceforge.net/
 Source0:    http://downloads.sourceforge.net/utfcpp/utf8_v2_3_4.zip
@@ -25,7 +24,6 @@ This project currently only contains header files, which can be found in the
 
 %package    devel
 Summary:    Header files for %{name}
-Group:      Development/Libraries
 BuildArch:  noarch
 Provides:   %{name}-static = %{version}-%{release}
 

From 63b8e41bef7070c4dcb26a9dc81e5eb0ca151559 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 3 Feb 2019 10:59:20 +0000
Subject: [PATCH 06/42] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 356207f..78a8e2c 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -3,7 +3,7 @@
 
 Name:       utf8cpp
 Version:    2.3.4
-Release:    11%{?dist}
+Release:    12%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 
 License:    Boost
@@ -66,6 +66,9 @@ done
 
 
 %changelog
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 6e341ac6692462fd6c9e4c1d88a367dfef4ae2e9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jul 2019 02:41:36 +0000
Subject: [PATCH 07/42] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 78a8e2c..c8212e1 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -3,7 +3,7 @@
 
 Name:       utf8cpp
 Version:    2.3.4
-Release:    12%{?dist}
+Release:    13%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 
 License:    Boost
@@ -66,6 +66,9 @@ done
 
 
 %changelog
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From a80a60928f8221a4e837c2af7b5501018c4a1300 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Tue, 22 Oct 2019 22:01:58 +0200
Subject: [PATCH 08/42] update to 2.3.6

- new upstream location
- use cmake and run tests
- switch main package to archful per
  https://docs.fedoraproject.org/en-US/packaging-guidelines/#_do_not_use_noarch
---
 .gitignore   |  1 +
 sources      |  2 +-
 utf8cpp.spec | 48 ++++++++++++++++++++++++++++++++++--------------
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 11ab592..1923a1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /utf8_v2_3_4.zip
+/utfcpp-2.3.6.tar.gz
diff --git a/sources b/sources
index 1869822..0ebf6e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5e9522fde3debcad5e8922d796b2bd0  utf8_v2_3_4.zip
+SHA512 (utfcpp-2.3.6.tar.gz) = 8dfa4e3e3597ef5a8454adf72a0dc95dbbaf18eb4590e9cecf30c372e3488dd8b405b1d17e3db874bfd9756c7ce2c2961d6096f13b44dea42cc88a801787c459
diff --git a/utf8cpp.spec b/utf8cpp.spec
index 78a8e2c..71ed002 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -2,14 +2,15 @@
 %global debug_package %{nil}
 
 Name:       utf8cpp
-Version:    2.3.4
-Release:    12%{?dist}
+Version:    2.3.6
+Release:    1%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 
 License:    Boost
-URL:        http://utfcpp.sourceforge.net/
-Source0:    http://downloads.sourceforge.net/utfcpp/utf8_v2_3_4.zip
-BuildArch:  noarch
+URL:        https://github.com/nemtrif/utfcpp
+Source0:    https://github.com/nemtrif/utfcpp/archive/v%{version}/utfcpp-%{version}.tar.gz
+BuildRequires: cmake3
+BuildRequires: gcc-c++
 
 %description
 %{summary}.
@@ -40,24 +41,36 @@ This project currently only contains header files, which can be found in the
 
 
 %prep
-%setup -q -c %{name}-%{version}
+%setup -q -n utfcpp-%{version}
+mkdir build
 
 
 %build
-# nothing to do
+pushd build
+%cmake3 \
+   -DUTF8_TESTS=ON \
+   -DUTF8_SAMPLES=ON \
+   ..
+%make_build
+popd
 
 
 %install
-mkdir -p %{buildroot}%{_includedir}
-install -p -m0644 source/utf8.h %{buildroot}%{_includedir}/utf8.h
-mkdir -p %{buildroot}%{_includedir}/utf8
-for i in checked.h core.h unchecked.h; do
-    install -p -m0644 source/utf8/${i} %{buildroot}%{_includedir}/utf8/${i}
-done
+pushd build
+%make_install
+popd
+pushd %{buildroot}%{_includedir}
+mv utf8cpp/utf8{,.h} .
+popd
+rm -r %{buildroot}%{_libdir}/cmake/utf8cpp
 
+%check
+pushd build
+%make_build test
+popd
 
 %files devel
-%doc doc/*
+%doc README.md samples/docsample.cpp
 %{_includedir}/utf8.h
 %dir %{_includedir}/utf8
 %{_includedir}/utf8/checked.h
@@ -66,6 +79,13 @@ done
 
 
 %changelog
+* Mon Oct 21 2019 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 2.3.6-1
+- update to 2.3.6
+- new upstream location
+- use cmake and run tests
+- switch main package to archful per
+  https://docs.fedoraproject.org/en-US/packaging-guidelines/#_do_not_use_noarch
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.4-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 399c7349862ee76a2314d13845dcd72db00d89a7 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Tue, 22 Oct 2019 22:02:51 +0200
Subject: [PATCH 09/42] drop extra empty lines

---
 utf8cpp.spec | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 71ed002..574342f 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -5,7 +5,6 @@ Name:       utf8cpp
 Version:    2.3.6
 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
@@ -39,12 +38,10 @@ Features include:
 This project currently only contains header files, which can be found in the
 %{name}-devel package.
 
-
 %prep
 %setup -q -n utfcpp-%{version}
 mkdir build
 
-
 %build
 pushd build
 %cmake3 \
@@ -54,7 +51,6 @@ pushd build
 %make_build
 popd
 
-
 %install
 pushd build
 %make_install
@@ -77,7 +73,6 @@ popd
 %{_includedir}/utf8/core.h
 %{_includedir}/utf8/unchecked.h
 
-
 %changelog
 * Mon Oct 21 2019 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 2.3.6-1
 - update to 2.3.6

From bab4e31b21ca8bfae88f52219461af12ee831b88 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Sun, 27 Oct 2019 01:10:33 +0200
Subject: [PATCH 10/42] update to 3.1

include cmake import file
symlink headers in the previous location for compatibility
---
 .gitignore                     |  1 +
 sources                        |  2 +-
 utf8cpp-noarch.patch           | 12 ++++++++++++
 utf8cpp-use-system-gtest.patch | 32 ++++++++++++++++++++++++++++++++
 utf8cpp.spec                   | 25 ++++++++++++++++++++++---
 5 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 utf8cpp-noarch.patch
 create mode 100644 utf8cpp-use-system-gtest.patch

diff --git a/.gitignore b/.gitignore
index 1923a1a..96ab17d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /utf8_v2_3_4.zip
 /utfcpp-2.3.6.tar.gz
+/utfcpp-3.1.tar.gz
diff --git a/sources b/sources
index 0ebf6e8..a2c8cd8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (utfcpp-2.3.6.tar.gz) = 8dfa4e3e3597ef5a8454adf72a0dc95dbbaf18eb4590e9cecf30c372e3488dd8b405b1d17e3db874bfd9756c7ce2c2961d6096f13b44dea42cc88a801787c459
+SHA512 (utfcpp-3.1.tar.gz) = 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
diff --git a/utf8cpp-noarch.patch b/utf8cpp-noarch.patch
new file mode 100644
index 0000000..ff63bce
--- /dev/null
+++ b/utf8cpp-noarch.patch
@@ -0,0 +1,12 @@
+diff -up utfcpp-3.1/CMakeLists.txt.noarch utfcpp-3.1/CMakeLists.txt
+--- utfcpp-3.1/CMakeLists.txt.noarch	2019-10-22 09:52:44.918701226 +0200
++++ utfcpp-3.1/CMakeLists.txt	2019-10-22 09:51:52.374148428 +0200
+@@ -17,7 +17,7 @@ if(UTF8_INSTALL)
+         set(DEF_INSTALL_CMAKE_DIR CMake)
+     else()
+         include(GNUInstallDirs) # define CMAKE_INSTALL_*
+-        set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/utf8cpp)
++        set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_DATADIR}/cmake/utf8cpp)
+     endif()
+ 
+     install(DIRECTORY source/ DESTINATION include/utf8cpp)
diff --git a/utf8cpp-use-system-gtest.patch b/utf8cpp-use-system-gtest.patch
new file mode 100644
index 0000000..205a3ed
--- /dev/null
+++ b/utf8cpp-use-system-gtest.patch
@@ -0,0 +1,32 @@
+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)
+ 
diff --git a/utf8cpp.spec b/utf8cpp.spec
index 23b6f85..8ef8c8b 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -2,14 +2,18 @@
 %global debug_package %{nil}
 
 Name:       utf8cpp
-Version:    2.3.6
+Version:    3.1
 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
+# put cmake import file in arch-agnostic directory
+Patch1:     %{name}-noarch.patch
 BuildRequires: cmake3
 BuildRequires: gcc-c++
+BuildRequires: gtest-devel
 
 %description
 %{summary}.
@@ -26,6 +30,7 @@ This project currently only contains header files, which can be found in the
 Summary:    Header files for %{name}
 BuildArch:  noarch
 Provides:   %{name}-static = %{version}-%{release}
+Requires:   cmake-filesystem
 
 %description devel
 %{summary}.
@@ -40,6 +45,9 @@ This project currently only contains header files, which can be found in the
 
 %prep
 %setup -q -n utfcpp-%{version}
+%patch0 -p1 -b .gtest
+%patch1 -p1 -b .noarch
+#%%patch10 -p1
 mkdir build
 
 %build
@@ -56,9 +64,12 @@ pushd build
 %make_install
 popd
 pushd %{buildroot}%{_includedir}
-mv utf8cpp/utf8{,.h} .
+ln -s utf8cpp/utf8.h ./
+mkdir utf8
+for f in {{un,}checked,core,cpp11}.h ; do
+    ln -s ../utf8cpp/utf8/${f} utf8/
+done
 popd
-rm -r %{buildroot}%{_libdir}/cmake/utf8cpp
 
 %check
 pushd build
@@ -71,9 +82,17 @@ popd
 %dir %{_includedir}/utf8
 %{_includedir}/utf8/checked.h
 %{_includedir}/utf8/core.h
+%{_includedir}/utf8/cpp11.h
 %{_includedir}/utf8/unchecked.h
+%{_includedir}/utf8cpp
+%{_datadir}/cmake/utf8cpp
 
 %changelog
+* Tue Oct 22 2019 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 3.1-1
+- update to 3.1
+- include cmake import file
+- symlink headers in the previous location for compatibility
+
 * Mon Oct 21 2019 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 2.3.6-1
 - update to 2.3.6
 - new upstream location

From 8ade26b34e08a574f09614d1198ab5bafb85cd54 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jan 2020 02:49:30 +0000
Subject: [PATCH 11/42] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 8ef8c8b..2771792 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -3,7 +3,7 @@
 
 Name:       utf8cpp
 Version:    3.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    Boost
 URL:        https://github.com/nemtrif/utfcpp
@@ -88,6 +88,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Oct 22 2019 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 3.1-1
 - update to 3.1
 - include cmake import file

From 799ae01ed14365fe28c63fbee3c6c4067188c1d0 Mon Sep 17 00:00:00 2001
From: Igor Raits <ignatenkobrain@fedoraproject.org>
Date: Mon, 6 Jul 2020 09:42:45 +0200
Subject: [PATCH 12/42] Improve compatibility with new CMake macro

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
---
 utf8cpp.spec | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 2771792..c66523a 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -1,3 +1,4 @@
+%undefine __cmake_in_source_build
 # This package only contains header files.
 %global debug_package %{nil}
 
@@ -48,21 +49,16 @@ This project currently only contains header files, which can be found in the
 %patch0 -p1 -b .gtest
 %patch1 -p1 -b .noarch
 #%%patch10 -p1
-mkdir build
 
 %build
-pushd build
 %cmake3 \
    -DUTF8_TESTS=ON \
    -DUTF8_SAMPLES=ON \
-   ..
-%make_build
-popd
+   %{nil}
+%cmake3_build
 
 %install
-pushd build
-%make_install
-popd
+%cmake3_install
 pushd %{buildroot}%{_includedir}
 ln -s utf8cpp/utf8.h ./
 mkdir utf8
@@ -72,9 +68,7 @@ done
 popd
 
 %check
-pushd build
-%make_build test
-popd
+%ctest
 
 %files devel
 %doc README.md samples/docsample.cpp

From 566c8e511d6ad638ea2091612bc2015850269bbc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jul 2020 13:27:58 +0000
Subject: [PATCH 13/42] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index c66523a..63a23a9 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -4,7 +4,7 @@
 
 Name:       utf8cpp
 Version:    3.1
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    Boost
 URL:        https://github.com/nemtrif/utfcpp
@@ -82,6 +82,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From e2e744ba03d83b366fc35eb2329e48042650215e Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Mon, 5 Oct 2020 14:27:16 +0200
Subject: [PATCH 14/42] update to 3.1.2 (#1883049)

---
 .gitignore   | 1 +
 sources      | 2 +-
 utf8cpp.spec | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 96ab17d..a357ee5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /utf8_v2_3_4.zip
 /utfcpp-2.3.6.tar.gz
 /utfcpp-3.1.tar.gz
+/utfcpp-3.1.2.tar.gz
diff --git a/sources b/sources
index a2c8cd8..93084ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (utfcpp-3.1.tar.gz) = 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
+SHA512 (utfcpp-3.1.2.tar.gz) = d43df19d9e8652291f1301a326ec0d592bad43d6ecf9086947037f0ae0c1e70c2d96082c48066639e2b7c57c0ea0e4782d6b215d017cf96a4c73ff3a15feec75
diff --git a/utf8cpp.spec b/utf8cpp.spec
index 2771792..decbcc3 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -2,8 +2,8 @@
 %global debug_package %{nil}
 
 Name:       utf8cpp
-Version:    3.1
-Release:    2%{?dist}
+Version:    3.1.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
@@ -88,6 +88,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Mon Oct 05 2020 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 3.1.2-1
+- update to 3.1.2 (#1883049)
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 3e4ef3c863aa1f212fcf0543839ea8e792d16797 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 27 Jan 2021 22:49:58 +0000
Subject: [PATCH 15/42] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 40802a4..db1432d 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -4,7 +4,7 @@
 
 Name:       utf8cpp
 Version:    3.1.2
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    Boost
 URL:        https://github.com/nemtrif/utfcpp
@@ -82,6 +82,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Oct 05 2020 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 3.1.2-1
 - update to 3.1.2 (#1883049)
 

From ce4f7fdccc7f7b99359e510d77bb987c07069377 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Tue, 4 May 2021 13:27:06 +0200
Subject: [PATCH 16/42] update to 3.2 (#1956027)

---
 .gitignore                     |  2 ++
 sources                        |  3 ++-
 utf8cpp-use-system-gtest.patch | 32 --------------------------------
 utf8cpp.spec                   | 16 ++++++++++------
 4 files changed, 14 insertions(+), 39 deletions(-)
 delete mode 100644 utf8cpp-use-system-gtest.patch

diff --git a/.gitignore b/.gitignore
index a357ee5..9838e64 100644
--- a/.gitignore
+++ b/.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
diff --git a/sources b/sources
index 93084ea..81eb2d3 100644
--- a/sources
+++ b/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
diff --git a/utf8cpp-use-system-gtest.patch b/utf8cpp-use-system-gtest.patch
deleted file mode 100644
index 205a3ed..0000000
--- a/utf8cpp-use-system-gtest.patch
+++ /dev/null
@@ -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)
- 
diff --git a/utf8cpp.spec b/utf8cpp.spec
index db1432d..9cf3cc6 100644
--- a/utf8cpp.spec
+++ b/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
 

From ce46a5948b836458134f3d136551c988e93dae70 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Tue, 4 May 2021 13:27:28 +0200
Subject: [PATCH 17/42] drop commented-out line

---
 utf8cpp.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 9cf3cc6..c7ddbb1 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -49,7 +49,6 @@ This project currently only contains header files, which can be found in the
 %setup -q -n utfcpp-%{version} -a1
 rmdir extern/ftest && mv ftest-%{ftest_commit} extern/ftest
 %patch1 -p1 -b .noarch
-#%%patch10 -p1
 
 %build
 %cmake3 \

From cd8facc5032814c2f48d9b6c14fca10cfaf3b879 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Wed, 19 May 2021 11:21:28 +0200
Subject: [PATCH 18/42] add missed compatibility link for cpp17.h

---
 utf8cpp.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index c7ddbb1..18da938 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -6,7 +6,7 @@
 
 Name:       utf8cpp
 Version:    3.2
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    Boost
 URL:        https://github.com/nemtrif/utfcpp
@@ -62,7 +62,7 @@ rmdir extern/ftest && mv ftest-%{ftest_commit} extern/ftest
 pushd %{buildroot}%{_includedir}
 ln -s utf8cpp/utf8.h ./
 mkdir utf8
-for f in {{un,}checked,core,cpp11}.h ; do
+for f in {{un,}checked,core,cpp11,cpp17}.h ; do
     ln -s ../utf8cpp/utf8/${f} utf8/
 done
 popd
@@ -77,11 +77,15 @@ popd
 %{_includedir}/utf8/checked.h
 %{_includedir}/utf8/core.h
 %{_includedir}/utf8/cpp11.h
+%{_includedir}/utf8/cpp17.h
 %{_includedir}/utf8/unchecked.h
 %{_includedir}/utf8cpp
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Wed May 19 2021 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 3.2-2
+- add missed compatibility link for cpp17.h
+
 * Tue May 04 2021 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 3.2-1
 - update to 3.2 (#1956027)
 

From 0eddfa8f475da4310df16fb8a24562eb0972b903 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Mon, 7 Jun 2021 12:47:54 +0200
Subject: [PATCH 19/42] update to 3.2.1 (#1968224)

---
 .gitignore   | 1 +
 sources      | 2 +-
 utf8cpp.spec | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9838e64..69af683 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /utfcpp-3.1.2.tar.gz
 /ftest-9c7e60c.tar.gz
 /utfcpp-3.2.tar.gz
+/utfcpp-3.2.1.tar.gz
diff --git a/sources b/sources
index 81eb2d3..71916df 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (ftest-9c7e60c.tar.gz) = c57ec5e88ce61dee9e751595e9a57e03f655e78d7dca0e7a6b4f4f63acb49197676f31a8bd5ea698207c4a4665ccc1bc810b6ec715dec3b69a48a85a8ce224d0
-SHA512 (utfcpp-3.2.tar.gz) = 7e6d3d002630118d21bbbf6b6b11a3cdc7082ff7cbf4f2b81e7cf2171d4a000c1d033b733a735437f1fa05172572ba18926cd52cc437f585d5e19bd032fbc8a0
+SHA512 (utfcpp-3.2.1.tar.gz) = 5798487f12b1bc55d3e06aed38f7604271ca3402963efcf85d181fd590d8a088d21e961e77698e60dc2cdae8cf4506645903442c45fd328201752d9589180e0d
diff --git a/utf8cpp.spec b/utf8cpp.spec
index 18da938..c2a613e 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -5,8 +5,8 @@
 %global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7})
 
 Name:       utf8cpp
-Version:    3.2
-Release:    2%{?dist}
+Version:    3.2.1
+Release:    1%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    Boost
 URL:        https://github.com/nemtrif/utfcpp
@@ -83,6 +83,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Mon Jun 07 2021 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 3.2.1-1
+- update to 3.2.1 (#1968224)
+
 * Wed May 19 2021 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 3.2-2
 - add missed compatibility link for cpp17.h
 

From 8431a37ab42ddac051434f0e7ec8ee9e7e650f73 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 20:13:18 +0000
Subject: [PATCH 20/42] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index c2a613e..543f782 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -6,7 +6,7 @@
 
 Name:       utf8cpp
 Version:    3.2.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    Boost
 URL:        https://github.com/nemtrif/utfcpp
@@ -83,6 +83,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Mon Jun 07 2021 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 3.2.1-1
 - update to 3.2.1 (#1968224)
 

From ec56fbc3b8e382aaa14e8f4da3c663435e69e938 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 03:42:25 +0000
Subject: [PATCH 21/42] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 543f782..6274fb6 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -6,7 +6,7 @@
 
 Name:       utf8cpp
 Version:    3.2.1
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    Boost
 URL:        https://github.com/nemtrif/utfcpp
@@ -83,6 +83,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From c0ad4babb3b480bf01c78be4d65b6f17b49c1b42 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 11:35:20 +0000
Subject: [PATCH 22/42] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 6274fb6..b5b29d8 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -6,7 +6,7 @@
 
 Name:       utf8cpp
 Version:    3.2.1
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    Boost
 URL:        https://github.com/nemtrif/utfcpp
@@ -83,6 +83,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From b5a393a1342b39c981fe188c047ee22affe646bc Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Wed, 7 Dec 2022 13:26:53 +0100
Subject: [PATCH 23/42] update to 3.2.2 (#2140879)

---
 .gitignore   | 2 ++
 sources      | 4 ++--
 utf8cpp.spec | 9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 69af683..5b827bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 /ftest-9c7e60c.tar.gz
 /utfcpp-3.2.tar.gz
 /utfcpp-3.2.1.tar.gz
+/ftest-bf75576.tar.gz
+/utfcpp-3.2.2.tar.gz
diff --git a/sources b/sources
index 71916df..71fe844 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ftest-9c7e60c.tar.gz) = c57ec5e88ce61dee9e751595e9a57e03f655e78d7dca0e7a6b4f4f63acb49197676f31a8bd5ea698207c4a4665ccc1bc810b6ec715dec3b69a48a85a8ce224d0
-SHA512 (utfcpp-3.2.1.tar.gz) = 5798487f12b1bc55d3e06aed38f7604271ca3402963efcf85d181fd590d8a088d21e961e77698e60dc2cdae8cf4506645903442c45fd328201752d9589180e0d
+SHA512 (ftest-bf75576.tar.gz) = 80aef7158fcf70fcf937b98d7a2c496f8122e4a2c17e9d92c7a6081203075e8b663cd7ffab91ed4d9291b14810e38dadff693fe937feaa160747692da4bcec92
+SHA512 (utfcpp-3.2.2.tar.gz) = b3d338bbb859eb6c6d38525a2d23062c3f5486bbc85e160e1e118ac557823d4ea128554fdf7a03288f7a3a6ba2c06830d6e51a714d0b5fc6a8001a870d560ac8
diff --git a/utf8cpp.spec b/utf8cpp.spec
index b5b29d8..3d18429 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -1,12 +1,12 @@
 %undefine __cmake_in_source_build
 # This package only contains header files.
 %global debug_package %{nil}
-%global ftest_commit 9c7e60cc1b7c76f59e2ffbbc3dad15bafc5cdac5
+%global ftest_commit bf75576064fce2e07f52cd63a3e410f12358728b
 %global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7})
 
 Name:       utf8cpp
-Version:    3.2.1
-Release:    4%{?dist}
+Version:    3.2.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
@@ -83,6 +83,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Wed Dec 07 2022 Dominik 'Rathann' Mierzejewski <dominik@greysector.net> - 3.2.2-1
+- update to 3.2.2 (#2140879)
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From bd363a18f5949a8260e784a28e498fe407731317 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Tue, 3 Jan 2023 14:08:36 +0100
Subject: [PATCH 24/42] update to 3.2.3 (#2157206)

---
 .gitignore           |  2 ++
 sources              |  4 ++--
 utf8cpp-noarch.patch | 10 +++++-----
 utf8cpp.spec         |  7 +++++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5b827bc..7caea4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
 /utfcpp-3.2.1.tar.gz
 /ftest-bf75576.tar.gz
 /utfcpp-3.2.2.tar.gz
+/ftest-c4ad4af.tar.gz
+/utfcpp-3.2.3.tar.gz
diff --git a/sources b/sources
index 71fe844..900b513 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ftest-bf75576.tar.gz) = 80aef7158fcf70fcf937b98d7a2c496f8122e4a2c17e9d92c7a6081203075e8b663cd7ffab91ed4d9291b14810e38dadff693fe937feaa160747692da4bcec92
-SHA512 (utfcpp-3.2.2.tar.gz) = b3d338bbb859eb6c6d38525a2d23062c3f5486bbc85e160e1e118ac557823d4ea128554fdf7a03288f7a3a6ba2c06830d6e51a714d0b5fc6a8001a870d560ac8
+SHA512 (ftest-c4ad4af.tar.gz) = ac328665d2f22fe72f7252d4f7ae84c74ea551407ba618151ef1c281159df8744f1e6efb9b21d4e1df774528f0b979d45ee5d82d3e8ab146aa9f2ad91b0b6d37
+SHA512 (utfcpp-3.2.3.tar.gz) = 760977df613abfb34fb7864cbbe90e8f2cf1f42b8502427a5e9c2a756ce87655120b7490ebdaa6c926a2cb56caef9ead0e0e10fb7cb732cf99a5b43c0cca411b
diff --git a/utf8cpp-noarch.patch b/utf8cpp-noarch.patch
index ff63bce..9293874 100644
--- a/utf8cpp-noarch.patch
+++ b/utf8cpp-noarch.patch
@@ -1,7 +1,7 @@
-diff -up utfcpp-3.1/CMakeLists.txt.noarch utfcpp-3.1/CMakeLists.txt
---- utfcpp-3.1/CMakeLists.txt.noarch	2019-10-22 09:52:44.918701226 +0200
-+++ utfcpp-3.1/CMakeLists.txt	2019-10-22 09:51:52.374148428 +0200
-@@ -17,7 +17,7 @@ if(UTF8_INSTALL)
+diff -up utfcpp-3.2.3/CMakeLists.txt.noarch utfcpp-3.2.3/CMakeLists.txt
+--- utfcpp-3.2.3/CMakeLists.txt.noarch	2023-01-03 14:54:55.003285601 +0100
++++ utfcpp-3.2.3/CMakeLists.txt	2023-01-03 14:55:34.844123997 +0100
+@@ -24,7 +24,7 @@ if(UTF8_INSTALL)
          set(DEF_INSTALL_CMAKE_DIR CMake)
      else()
          include(GNUInstallDirs) # define CMAKE_INSTALL_*
@@ -9,4 +9,4 @@ diff -up utfcpp-3.1/CMakeLists.txt.noarch utfcpp-3.1/CMakeLists.txt
 +        set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_DATADIR}/cmake/utf8cpp)
      endif()
  
-     install(DIRECTORY source/ DESTINATION include/utf8cpp)
+     write_basic_package_version_file(
diff --git a/utf8cpp.spec b/utf8cpp.spec
index 3d18429..8ca2c7f 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -1,11 +1,11 @@
 %undefine __cmake_in_source_build
 # This package only contains header files.
 %global debug_package %{nil}
-%global ftest_commit bf75576064fce2e07f52cd63a3e410f12358728b
+%global ftest_commit c4ad4af0946b73ce1a40cbc72205d15d196c7e06
 %global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7})
 
 Name:       utf8cpp
-Version:    3.2.2
+Version:    3.2.3
 Release:    1%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    Boost
@@ -83,6 +83,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Tue Jan 03 2023 Dominik 'Rathann' Mierzejewski <dominik@greysector.net> - 3.2.3-1
+- update to 3.2.3 (#2157206)
+
 * Wed Dec 07 2022 Dominik 'Rathann' Mierzejewski <dominik@greysector.net> - 3.2.2-1
 - update to 3.2.2 (#2140879)
 

From 6cc38ffadc507869591ad6b555689012c2c8db0c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 21 Jan 2023 06:00:59 +0000
Subject: [PATCH 25/42] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 8ca2c7f..65dd702 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -6,7 +6,7 @@
 
 Name:       utf8cpp
 Version:    3.2.3
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    Boost
 URL:        https://github.com/nemtrif/utfcpp
@@ -83,6 +83,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Tue Jan 03 2023 Dominik 'Rathann' Mierzejewski <dominik@greysector.net> - 3.2.3-1
 - update to 3.2.3 (#2157206)
 

From fb1a213e8003d3c7645318f44ac3de02eac3fdcc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jul 2023 17:19:19 +0000
Subject: [PATCH 26/42] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 65dd702..78f8428 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -6,7 +6,7 @@
 
 Name:       utf8cpp
 Version:    3.2.3
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    Boost
 URL:        https://github.com/nemtrif/utfcpp
@@ -83,6 +83,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From adfccdccc6d4120110ac5f18f08ccea6662dea00 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Thu, 31 Aug 2023 14:10:40 +0200
Subject: [PATCH 27/42] update to 3.2.4 (resolves rhbz#2231660)

switch to wildcards in .gitignore
---
 .gitignore           | 12 ++----------
 sources              |  2 +-
 utf8cpp-noarch.patch |  8 ++++----
 utf8cpp.spec         |  7 +++++--
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7caea4f..35ed041 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,3 @@
 /utf8_v2_3_4.zip
-/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
-/utfcpp-3.2.1.tar.gz
-/ftest-bf75576.tar.gz
-/utfcpp-3.2.2.tar.gz
-/ftest-c4ad4af.tar.gz
-/utfcpp-3.2.3.tar.gz
+/ftest-*.tar.gz
+/utfcpp-*.tar.gz
diff --git a/sources b/sources
index 900b513..824d05a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (ftest-c4ad4af.tar.gz) = ac328665d2f22fe72f7252d4f7ae84c74ea551407ba618151ef1c281159df8744f1e6efb9b21d4e1df774528f0b979d45ee5d82d3e8ab146aa9f2ad91b0b6d37
-SHA512 (utfcpp-3.2.3.tar.gz) = 760977df613abfb34fb7864cbbe90e8f2cf1f42b8502427a5e9c2a756ce87655120b7490ebdaa6c926a2cb56caef9ead0e0e10fb7cb732cf99a5b43c0cca411b
+SHA512 (utfcpp-3.2.4.tar.gz) = 5135b13a03ee814cb35e04459b2d91b8fbe91cd518a604c41062b4ad42b739fce1acf946b01904309e0edffb874f5e81f69d28afdc8b6f759ef2d675ca0c0db0
diff --git a/utf8cpp-noarch.patch b/utf8cpp-noarch.patch
index 9293874..a6d24bf 100644
--- a/utf8cpp-noarch.patch
+++ b/utf8cpp-noarch.patch
@@ -1,6 +1,6 @@
-diff -up utfcpp-3.2.3/CMakeLists.txt.noarch utfcpp-3.2.3/CMakeLists.txt
---- utfcpp-3.2.3/CMakeLists.txt.noarch	2023-01-03 14:54:55.003285601 +0100
-+++ utfcpp-3.2.3/CMakeLists.txt	2023-01-03 14:55:34.844123997 +0100
+diff -up utfcpp-3.2.4/CMakeLists.txt.noarch utfcpp-3.2.4/CMakeLists.txt
+--- utfcpp-3.2.4/CMakeLists.txt.noarch	2023-08-31 14:09:08.102223665 +0200
++++ utfcpp-3.2.4/CMakeLists.txt	2023-08-31 14:09:32.632366839 +0200
 @@ -24,7 +24,7 @@ if(UTF8_INSTALL)
          set(DEF_INSTALL_CMAKE_DIR CMake)
      else()
@@ -9,4 +9,4 @@ diff -up utfcpp-3.2.3/CMakeLists.txt.noarch utfcpp-3.2.3/CMakeLists.txt
 +        set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_DATADIR}/cmake/utf8cpp)
      endif()
  
-     write_basic_package_version_file(
+     if(${CMAKE_VERSION} VERSION_GREATER "3.14")
diff --git a/utf8cpp.spec b/utf8cpp.spec
index 78f8428..477d7a4 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -5,8 +5,8 @@
 %global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7})
 
 Name:       utf8cpp
-Version:    3.2.3
-Release:    3%{?dist}
+Version:    3.2.4
+Release:    1%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    Boost
 URL:        https://github.com/nemtrif/utfcpp
@@ -83,6 +83,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Thu Aug 31 2023 Dominik Mierzejewski <dominik@greysector.net> - 3.2.4-1
+- update to 3.2.4 (resolves rhbz#2231660)
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From dab2426ba77fd6e80ca1c5fdee91af8af8e1122f Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Thu, 31 Aug 2023 14:12:35 +0200
Subject: [PATCH 28/42] switch to SPDX expression in License tag

---
 utf8cpp.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 477d7a4..e8d2d93 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -8,7 +8,7 @@ Name:       utf8cpp
 Version:    3.2.4
 Release:    1%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
-License:    Boost
+License:    BSL-1.0
 URL:        https://github.com/nemtrif/utfcpp
 Source0:    https://github.com/nemtrif/utfcpp/archive/v%{version}/utfcpp-%{version}.tar.gz
 Source1:    https://github.com/nemtrif/ftest/archive/%{ftest_commit}/ftest-%{ftest_shortcommit}.tar.gz
@@ -85,6 +85,7 @@ popd
 %changelog
 * Thu Aug 31 2023 Dominik Mierzejewski <dominik@greysector.net> - 3.2.4-1
 - update to 3.2.4 (resolves rhbz#2231660)
+- switch to SPDX expression in License tag
 
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

From 77a3c6be5ba6aafc9f49bf634674474f3ebd004e Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Thu, 31 Aug 2023 14:15:17 +0200
Subject: [PATCH 29/42] use modern autosetup and plain cmake dependency and
 macros

---
 utf8cpp.spec | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index e8d2d93..1b69388 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -14,7 +14,7 @@ Source0:    https://github.com/nemtrif/utfcpp/archive/v%{version}/utfcpp-%{versi
 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: cmake
 BuildRequires: gcc-c++
 
 %description
@@ -46,19 +46,18 @@ This project currently only contains header files, which can be found in the
 %{name}-devel package.
 
 %prep
-%setup -q -n utfcpp-%{version} -a1
+%autosetup -n utfcpp-%{version} -a1 -p1
 rmdir extern/ftest && mv ftest-%{ftest_commit} extern/ftest
-%patch1 -p1 -b .noarch
 
 %build
-%cmake3 \
+%cmake \
    -DUTF8_TESTS=ON \
    -DUTF8_SAMPLES=ON \
    %{nil}
-%cmake3_build
+%cmake_build
 
 %install
-%cmake3_install
+%cmake_install
 pushd %{buildroot}%{_includedir}
 ln -s utf8cpp/utf8.h ./
 mkdir utf8
@@ -86,6 +85,7 @@ popd
 * Thu Aug 31 2023 Dominik Mierzejewski <dominik@greysector.net> - 3.2.4-1
 - update to 3.2.4 (resolves rhbz#2231660)
 - switch to SPDX expression in License tag
+- use modern autosetup and plain cmake dependency and macros
 
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

From d638ed81ea4b8011800f2d59534df76c70510aff Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Sun, 8 Oct 2023 20:55:49 +0200
Subject: [PATCH 30/42] update to 3.2.5 (resolves rhbz#2240785)

---
 sources      | 2 +-
 utf8cpp.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index 824d05a..3f5cf2c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (ftest-c4ad4af.tar.gz) = ac328665d2f22fe72f7252d4f7ae84c74ea551407ba618151ef1c281159df8744f1e6efb9b21d4e1df774528f0b979d45ee5d82d3e8ab146aa9f2ad91b0b6d37
-SHA512 (utfcpp-3.2.4.tar.gz) = 5135b13a03ee814cb35e04459b2d91b8fbe91cd518a604c41062b4ad42b739fce1acf946b01904309e0edffb874f5e81f69d28afdc8b6f759ef2d675ca0c0db0
+SHA512 (utfcpp-3.2.5.tar.gz) = 1ce12c8158a2f3bcddec104ceacedaea4031b4c88fc0fa1f1fae8dfa8df81c846861df9d01e8f294d79b9e4ab8c51bd1289f404eed24d07abc760688fee13090
diff --git a/utf8cpp.spec b/utf8cpp.spec
index 1b69388..56dc483 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -5,7 +5,7 @@
 %global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7})
 
 Name:       utf8cpp
-Version:    3.2.4
+Version:    3.2.5
 Release:    1%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    BSL-1.0
@@ -82,6 +82,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Sun Oct 08 2023 Dominik Mierzejewski <dominik@greysector.net> - 3.2.5-1
+- update to 3.2.5 (resolves rhbz#2240785)
+
 * Thu Aug 31 2023 Dominik Mierzejewski <dominik@greysector.net> - 3.2.4-1
 - update to 3.2.4 (resolves rhbz#2231660)
 - switch to SPDX expression in License tag

From 1734b0da5d347713f17c51ee7bc6b7ae4e072a2c Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Thu, 14 Dec 2023 12:38:13 +0100
Subject: [PATCH 31/42] update to 4.0.5 (resolves rhbz#2245744)

- include license text
---
 sources              |  2 +-
 utf8cpp-cmake.patch  | 24 ++++++++++++++++++++++++
 utf8cpp-noarch.patch | 12 ------------
 utf8cpp.spec         | 24 +++++++++++++++++-------
 4 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100644 utf8cpp-cmake.patch
 delete mode 100644 utf8cpp-noarch.patch

diff --git a/sources b/sources
index 3f5cf2c..d38a759 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (ftest-c4ad4af.tar.gz) = ac328665d2f22fe72f7252d4f7ae84c74ea551407ba618151ef1c281159df8744f1e6efb9b21d4e1df774528f0b979d45ee5d82d3e8ab146aa9f2ad91b0b6d37
-SHA512 (utfcpp-3.2.5.tar.gz) = 1ce12c8158a2f3bcddec104ceacedaea4031b4c88fc0fa1f1fae8dfa8df81c846861df9d01e8f294d79b9e4ab8c51bd1289f404eed24d07abc760688fee13090
+SHA512 (utfcpp-4.0.5.tar.gz) = 49ca33bfb2ee44515f555184b51191f7b706a228fb84ddc62e1e6b59c7d69a5ff836f38694daad0012a0f651b6199451974fe44ebe80081df00cf8c2759e3249
diff --git a/utf8cpp-cmake.patch b/utf8cpp-cmake.patch
new file mode 100644
index 0000000..5f6324a
--- /dev/null
+++ b/utf8cpp-cmake.patch
@@ -0,0 +1,24 @@
+diff -up utfcpp-4.0.4/CMakeLists.txt.orig utfcpp-4.0.4/CMakeLists.txt
+--- utfcpp-4.0.4/CMakeLists.txt.orig	2023-12-10 16:42:20.000000000 +0100
++++ utfcpp-4.0.4/CMakeLists.txt	2023-12-14 12:37:01.511860031 +0100
+@@ -35,17 +35,17 @@ install(TARGETS ${PROJECT_NAME}
+ configure_package_config_file(
+     "${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in"
+     "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+-    INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
++    INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}
+ )
+ 
+ install(EXPORT ${PROJECT_NAME}Targets
+         FILE ${PROJECT_NAME}Targets.cmake
+         NAMESPACE ${PROJECT_NAME}::
+-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
++        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME})
+ 
+ install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+               "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
++        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME})
+ 
+ install(FILES ${PROJECT_SOURCE_DIR}/source/utf8.h DESTINATION include/utf8cpp)
+ install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/utf8 DESTINATION
diff --git a/utf8cpp-noarch.patch b/utf8cpp-noarch.patch
deleted file mode 100644
index a6d24bf..0000000
--- a/utf8cpp-noarch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up utfcpp-3.2.4/CMakeLists.txt.noarch utfcpp-3.2.4/CMakeLists.txt
---- utfcpp-3.2.4/CMakeLists.txt.noarch	2023-08-31 14:09:08.102223665 +0200
-+++ utfcpp-3.2.4/CMakeLists.txt	2023-08-31 14:09:32.632366839 +0200
-@@ -24,7 +24,7 @@ if(UTF8_INSTALL)
-         set(DEF_INSTALL_CMAKE_DIR CMake)
-     else()
-         include(GNUInstallDirs) # define CMAKE_INSTALL_*
--        set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/utf8cpp)
-+        set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_DATADIR}/cmake/utf8cpp)
-     endif()
- 
-     if(${CMAKE_VERSION} VERSION_GREATER "3.14")
diff --git a/utf8cpp.spec b/utf8cpp.spec
index 56dc483..f58b177 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -5,15 +5,15 @@
 %global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7})
 
 Name:       utf8cpp
-Version:    3.2.5
+Version:    4.0.5
 Release:    1%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    BSL-1.0
 URL:        https://github.com/nemtrif/utfcpp
 Source0:    https://github.com/nemtrif/utfcpp/archive/v%{version}/utfcpp-%{version}.tar.gz
 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
+# put cmake import file in correct directory
+Patch0:     %{name}-cmake.patch
 BuildRequires: cmake
 BuildRequires: gcc-c++
 
@@ -51,37 +51,47 @@ rmdir extern/ftest && mv ftest-%{ftest_commit} extern/ftest
 
 %build
 %cmake \
-   -DUTF8_TESTS=ON \
-   -DUTF8_SAMPLES=ON \
    %{nil}
 %cmake_build
+pushd tests
+%cmake
+%cmake_build
+popd
 
 %install
 %cmake_install
 pushd %{buildroot}%{_includedir}
 ln -s utf8cpp/utf8.h ./
 mkdir utf8
-for f in {{un,}checked,core,cpp11,cpp17}.h ; do
+for f in {{un,}checked,core,cpp{11,17,20}}.h ; do
     ln -s ../utf8cpp/utf8/${f} utf8/
 done
 popd
 
 %check
+pushd tests
 %ctest
+popd
 
 %files devel
-%doc README.md samples/docsample.cpp
+%doc README.md
+%license LICENSE
 %{_includedir}/utf8.h
 %dir %{_includedir}/utf8
 %{_includedir}/utf8/checked.h
 %{_includedir}/utf8/core.h
 %{_includedir}/utf8/cpp11.h
 %{_includedir}/utf8/cpp17.h
+%{_includedir}/utf8/cpp20.h
 %{_includedir}/utf8/unchecked.h
 %{_includedir}/utf8cpp
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Wed Jan 03 2024 Dominik Mierzejewski <dominik@greysector.net> - 4.0.5-1
+- update to 4.0.5 (resolves rhbz#2245744)
+- include license text
+
 * Sun Oct 08 2023 Dominik Mierzejewski <dominik@greysector.net> - 3.2.5-1
 - update to 3.2.5 (resolves rhbz#2240785)
 

From 226feedc1e2c65b7274a910180c58cb3bfb19f4e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jan 2024 07:21:10 +0000
Subject: [PATCH 32/42] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index f58b177..11d9cbb 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -6,7 +6,7 @@
 
 Name:       utf8cpp
 Version:    4.0.5
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    BSL-1.0
 URL:        https://github.com/nemtrif/utfcpp
@@ -88,6 +88,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Jan 03 2024 Dominik Mierzejewski <dominik@greysector.net> - 4.0.5-1
 - update to 4.0.5 (resolves rhbz#2245744)
 - include license text

From cf6bf1f6691b97bdc6367ff3b4dcfa3df7e7bdc0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 08:28:04 +0000
Subject: [PATCH 33/42] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 11d9cbb..15d7978 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -6,7 +6,7 @@
 
 Name:       utf8cpp
 Version:    4.0.5
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    BSL-1.0
 URL:        https://github.com/nemtrif/utfcpp
@@ -88,6 +88,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From a87f9cbdf1057497f8895cd95bba4f92a13de5e6 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Sun, 17 Nov 2024 23:15:27 +0100
Subject: [PATCH 34/42] update to 4.0.6 (resolves rhbz#2323791)

---
 sources      | 2 +-
 utf8cpp.spec | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index d38a759..1d4625e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (ftest-c4ad4af.tar.gz) = ac328665d2f22fe72f7252d4f7ae84c74ea551407ba618151ef1c281159df8744f1e6efb9b21d4e1df774528f0b979d45ee5d82d3e8ab146aa9f2ad91b0b6d37
-SHA512 (utfcpp-4.0.5.tar.gz) = 49ca33bfb2ee44515f555184b51191f7b706a228fb84ddc62e1e6b59c7d69a5ff836f38694daad0012a0f651b6199451974fe44ebe80081df00cf8c2759e3249
+SHA512 (utfcpp-4.0.6.tar.gz) = 53c59f2e04fe5d36faf98a238b94f774834a34982d481a8170ee144f7f8c2d4ba249a732d90654922944c1075c578690c327091883398c533d604bf49f4a6ecf
diff --git a/utf8cpp.spec b/utf8cpp.spec
index 15d7978..b60905a 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -5,8 +5,8 @@
 %global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7})
 
 Name:       utf8cpp
-Version:    4.0.5
-Release:    3%{?dist}
+Version:    4.0.6
+Release:    1%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    BSL-1.0
 URL:        https://github.com/nemtrif/utfcpp
@@ -88,6 +88,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Sun Nov 17 2024 Dominik Mierzejewski <dominik@greysector.net> - 4.0.6-1
+- update to 4.0.6 (resolves rhbz#2323791)
+
 * Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From bcc92d25c3e6a64f88c6cdc4668b6bf799d5ece7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 13:59:29 +0000
Subject: [PATCH 35/42] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index b60905a..596e4c2 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -6,7 +6,7 @@
 
 Name:       utf8cpp
 Version:    4.0.6
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    BSL-1.0
 URL:        https://github.com/nemtrif/utfcpp
@@ -88,6 +88,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Sun Nov 17 2024 Dominik Mierzejewski <dominik@greysector.net> - 4.0.6-1
 - update to 4.0.6 (resolves rhbz#2323791)
 

From 4f88c1ab73d3366e83e2aabfaa66f35ff9b3d1df Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 19:54:13 +0000
Subject: [PATCH 36/42] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 596e4c2..90f6a15 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -6,7 +6,7 @@
 
 Name:       utf8cpp
 Version:    4.0.6
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    BSL-1.0
 URL:        https://github.com/nemtrif/utfcpp
@@ -88,6 +88,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 875d592cef8257470ea12fd4b6619c77e8dd3f77 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Sat, 20 Sep 2025 22:46:27 +0200
Subject: [PATCH 37/42] update to 4.0.8 (resolves rhbz#2395010)

---
 sources      |  3 +--
 utf8cpp.spec | 11 ++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sources b/sources
index 1d4625e..2b287ca 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (ftest-c4ad4af.tar.gz) = ac328665d2f22fe72f7252d4f7ae84c74ea551407ba618151ef1c281159df8744f1e6efb9b21d4e1df774528f0b979d45ee5d82d3e8ab146aa9f2ad91b0b6d37
-SHA512 (utfcpp-4.0.6.tar.gz) = 53c59f2e04fe5d36faf98a238b94f774834a34982d481a8170ee144f7f8c2d4ba249a732d90654922944c1075c578690c327091883398c533d604bf49f4a6ecf
+SHA512 (utfcpp-4.0.8.tar.gz) = c33105136a65122f6b6c551af75a87d207d5cb30a53ab97569de713deff5766a213091b2f0f348771ca2d3b335aec7a17be731a1275be724e95490860758985c
diff --git a/utf8cpp.spec b/utf8cpp.spec
index 90f6a15..547a5a1 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -5,13 +5,12 @@
 %global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7})
 
 Name:       utf8cpp
-Version:    4.0.6
-Release:    3%{?dist}
+Version:    4.0.8
+Release:    1%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    BSL-1.0
 URL:        https://github.com/nemtrif/utfcpp
 Source0:    https://github.com/nemtrif/utfcpp/archive/v%{version}/utfcpp-%{version}.tar.gz
-Source1:    https://github.com/nemtrif/ftest/archive/%{ftest_commit}/ftest-%{ftest_shortcommit}.tar.gz
 # put cmake import file in correct directory
 Patch0:     %{name}-cmake.patch
 BuildRequires: cmake
@@ -46,8 +45,7 @@ This project currently only contains header files, which can be found in the
 %{name}-devel package.
 
 %prep
-%autosetup -n utfcpp-%{version} -a1 -p1
-rmdir extern/ftest && mv ftest-%{ftest_commit} extern/ftest
+%autosetup -n utfcpp-%{version} -p1
 
 %build
 %cmake \
@@ -88,6 +86,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Sat Sep 20 2025 Dominik Mierzejewski <dominik@greysector.net> - 4.0.8-1
+- update to 4.0.8 (resolves rhbz#2395010)
+
 * Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 

From 3845f0a282a0df2575107e08172e3200231f1d30 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Fri, 2 Jan 2026 13:36:32 +0100
Subject: [PATCH 38/42] update to 4.0.9 (resolves rhbz#2425940)

---
 sources      | 2 +-
 utf8cpp.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index 2b287ca..a828d12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (utfcpp-4.0.8.tar.gz) = c33105136a65122f6b6c551af75a87d207d5cb30a53ab97569de713deff5766a213091b2f0f348771ca2d3b335aec7a17be731a1275be724e95490860758985c
+SHA512 (utfcpp-4.0.9.tar.gz) = 02e2b84b5ea827dfbc7fc1fef52e30d72fb2aca3e81ea7780d0286fe67c49500b3acf8f877af2b5feac81af2244341b9052ffbceed774e5442a8184785207478
diff --git a/utf8cpp.spec b/utf8cpp.spec
index 547a5a1..800d725 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -5,7 +5,7 @@
 %global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7})
 
 Name:       utf8cpp
-Version:    4.0.8
+Version:    4.0.9
 Release:    1%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    BSL-1.0
@@ -86,6 +86,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Fri Jan 02 2026 Dominik Mierzejewski <dominik@greysector.net> - 4.0.9-1
+- update to 4.0.9 (resolves rhbz#2425940)
+
 * Sat Sep 20 2025 Dominik Mierzejewski <dominik@greysector.net> - 4.0.8-1
 - update to 4.0.8 (resolves rhbz#2395010)
 

From 1ddc9bc4829c11163a5d25b43be5f14e864a7137 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 17 Jan 2026 19:43:29 +0000
Subject: [PATCH 39/42] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index 800d725..202c5c7 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -6,7 +6,7 @@
 
 Name:       utf8cpp
 Version:    4.0.9
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    BSL-1.0
 URL:        https://github.com/nemtrif/utfcpp
@@ -86,6 +86,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Fri Jan 02 2026 Dominik Mierzejewski <dominik@greysector.net> - 4.0.9-1
 - update to 4.0.9 (resolves rhbz#2425940)
 

From ed5b268ee32965750c9b954d18582d3493a27406 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Tue, 19 May 2026 00:24:15 +0200
Subject: [PATCH 40/42] update to 4.1.0 (resolves rhbz#2478190)

---
 sources      | 2 +-
 utf8cpp.spec | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sources b/sources
index a828d12..762cf25 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (utfcpp-4.0.9.tar.gz) = 02e2b84b5ea827dfbc7fc1fef52e30d72fb2aca3e81ea7780d0286fe67c49500b3acf8f877af2b5feac81af2244341b9052ffbceed774e5442a8184785207478
+SHA512 (utfcpp-4.1.0.tar.gz) = 42e581a7f43b769ddd69f4541adbc5ac55935627a327b237d0571bb8959a6b5c79197da2e0393612d967ba32e06e14e73a1774d39e73af60da6a234ba9499d15
diff --git a/utf8cpp.spec b/utf8cpp.spec
index 202c5c7..ba7e660 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -5,8 +5,8 @@
 %global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7})
 
 Name:       utf8cpp
-Version:    4.0.9
-Release:    2%{?dist}
+Version:    4.1.0
+Release:    1%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    BSL-1.0
 URL:        https://github.com/nemtrif/utfcpp
@@ -72,7 +72,7 @@ pushd tests
 popd
 
 %files devel
-%doc README.md
+%doc API_REFERENCE.md README.md
 %license LICENSE
 %{_includedir}/utf8.h
 %dir %{_includedir}/utf8
@@ -86,6 +86,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Mon May 18 2026 Dominik Mierzejewski <dominik@greysector.net> - 4.1.0-1
+- update to 4.1.0 (resolves rhbz#2478190)
+
 * Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

From 6c4e9b20ca059b2bfb021ba5c907c27d93b3782f Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Fri, 22 May 2026 23:42:18 +0200
Subject: [PATCH 41/42] update to 4.1.1 (resolves rhbz#2480337)

---
 sources      | 2 +-
 utf8cpp.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index 762cf25..4f337f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (utfcpp-4.1.0.tar.gz) = 42e581a7f43b769ddd69f4541adbc5ac55935627a327b237d0571bb8959a6b5c79197da2e0393612d967ba32e06e14e73a1774d39e73af60da6a234ba9499d15
+SHA512 (utfcpp-4.1.1.tar.gz) = 72061902812b3f5b27afb32c513fc337db4149b8a6e51cbfe497109f88145751484093990bb1b20b4eec2b9f621406690030401b2a51c9368eb481f00225cd24
diff --git a/utf8cpp.spec b/utf8cpp.spec
index ba7e660..c99bf35 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -5,7 +5,7 @@
 %global ftest_shortcommit %(c=%{ftest_commit}; echo ${c:0:7})
 
 Name:       utf8cpp
-Version:    4.1.0
+Version:    4.1.1
 Release:    1%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    BSL-1.0
@@ -86,6 +86,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Fri May 22 2026 Dominik Mierzejewski <dominik@greysector.net> - 4.1.1-1
+- update to 4.1.1 (resolves rhbz#2480337)
+
 * Mon May 18 2026 Dominik Mierzejewski <dominik@greysector.net> - 4.1.0-1
 - update to 4.1.0 (resolves rhbz#2478190)
 

From a14f2b084c8ac1a6d507e26de948dcb98ac0a65f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jul 2026 08:18:06 +0000
Subject: [PATCH 42/42] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

---
 utf8cpp.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utf8cpp.spec b/utf8cpp.spec
index c99bf35..f07f502 100644
--- a/utf8cpp.spec
+++ b/utf8cpp.spec
@@ -6,7 +6,7 @@
 
 Name:       utf8cpp
 Version:    4.1.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A simple, portable and lightweight library for handling UTF-8 encoded strings
 License:    BSL-1.0
 URL:        https://github.com/nemtrif/utfcpp
@@ -86,6 +86,9 @@ popd
 %{_datadir}/cmake/utf8cpp
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Fri May 22 2026 Dominik Mierzejewski <dominik@greysector.net> - 4.1.1-1
 - update to 4.1.1 (resolves rhbz#2480337)