update to 3.1

include cmake import file
symlink headers in the previous location for compatibility

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