.gitignore

@@ -1,2 +1,2 @@
-SOURCES/utfcpp-3.2.1.tar.gz
+/utf8_v2_3_4.zip
-SOURCES/ftest-9c7e60c.tar.gz
+/utfcpp-2.3.6.tar.gz

.utf8cpp.metadata

@@ -1,2 +0,0 @@
-04c614fc761a03de239fd290760800dc26091046  SOURCES/utfcpp-3.2.1.tar.gz
-5f659cb2b4d5a08644df5fba84b506e8cb4092fe  SOURCES/ftest-9c7e60c.tar.gz

SOURCES/utf8cpp-noarch.patch

@@ -1,12 +0,0 @@
-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)

sources

@@ -0,0 +1 @@
+SHA512 (utfcpp-2.3.6.tar.gz) = 8dfa4e3e3597ef5a8454adf72a0dc95dbbaf18eb4590e9cecf30c372e3488dd8b405b1d17e3db874bfd9756c7ce2c2961d6096f13b44dea42cc88a801787c459

utf8cpp.spec

@@ -1,19 +1,13 @@
-%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.2.1
+Version:    2.3.6
-Release:    3%{?dist}
+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
-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++
 
@@ -32,7 +26,6 @@ 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}.
@@ -46,29 +39,31 @@ This project currently only contains header files, which can be found in the
 %{name}-devel package.
 
 %prep
-%setup -q -n utfcpp-%{version} -a1
+%setup -q -n utfcpp-%{version}
-rmdir extern/ftest && mv ftest-%{ftest_commit} extern/ftest
+mkdir build
-%patch1 -p1 -b .noarch
 
 %build
+pushd build
 %cmake3 \
    -DUTF8_TESTS=ON \
    -DUTF8_SAMPLES=ON \
-   %{nil}
+   ..
-%cmake3_build
+%make_build
+popd
 
 %install
-%cmake3_install
+pushd build
+%make_install
+popd
 pushd %{buildroot}%{_includedir}
-ln -s utf8cpp/utf8.h ./
+mv utf8cpp/utf8{,.h} .
-mkdir utf8
-for f in {{un,}checked,core,cpp11,cpp17}.h ; do
-    ln -s ../utf8cpp/utf8/${f} utf8/
-done
 popd
+rm -r %{buildroot}%{_libdir}/cmake/utf8cpp
 
 %check
-%ctest
+pushd build
+%make_build test
+popd
 
 %files devel
 %doc README.md samples/docsample.cpp
@@ -76,48 +71,9 @@ popd
 %dir %{_includedir}/utf8
 %{_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 Feb 07 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 3.2.1-3
-- Rebuilt for MSVSphere 9.3
-
-* 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
-
-* 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
-
-* 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
-
-* Mon Oct 05 2020 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 3.1.2-1
-- update to 3.1.2 (#1883049)
-
-* 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
-
-* 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