Merge branch 'f29' into f30

.gitignore

@@ -8,3 +8,4 @@ libebml-1.0.0.tar.bz2
 /libebml-1.3.4.tar.bz2
 /libebml-1.3.5.tar.xz
 /libebml-1.3.6.tar.xz
+/libebml-1.3.7.tar.xz

libebml-use-system-utf8cpp.patch

@@ -0,0 +1,12 @@
+diff -up libebml-1.3.7/src/EbmlUnicodeString.cpp.utf8cpp libebml-1.3.7/src/EbmlUnicodeString.cpp
+--- libebml-1.3.7/src/EbmlUnicodeString.cpp.utf8cpp	2019-03-12 20:27:42.000000000 +0100
++++ libebml-1.3.7/src/EbmlUnicodeString.cpp	2019-06-07 22:54:39.002363241 +0200
+@@ -39,7 +39,7 @@
+ 
+ #include "ebml/EbmlUnicodeString.h"
+ 
+-#include "lib/utf8-cpp/source/utf8/checked.h"
++#include <utf8/checked.h>
+ 
+ START_LIBEBML_NAMESPACE
+ 

libebml.spec

@@ -1,12 +1,14 @@
 Summary:    Extensible Binary Meta Language library
 Name:       libebml
-Version:    1.3.6
+Version:    1.3.7
-Release:    3%{?dist}
+Release:    1%{?dist}
 License:    LGPLv2+
 URL:        https://www.matroska.org/
 Source:     https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz
-BuildRequires: cmake
+Patch0:     %{name}-use-system-utf8cpp.patch
+BuildRequires: cmake3
 BuildRequires: gcc-c++
+BuildRequires: utf8cpp-devel
 
 %description
 Extensible Binary Meta Language access library A library for reading
@@ -17,7 +19,7 @@ pendant to XML.
 %package    devel
 Summary:    Development files for the Extensible Binary Meta Language library
 Requires:   %{name}%{?_isa} = %{version}-%{release}
-Requires:   cmake-filesystem
+Requires:   %{_libdir}/cmake
 Requires:   pkgconfig
 
 %description devel
@@ -31,10 +33,12 @@ will use the Extensible Binary Meta Language library.
 
 %prep
 %setup -q
+%patch0 -p1 -b .utf8cpp
+rm -r src/lib/utf8-cpp
 
 
 %build
-%cmake .
+%cmake3 .
 make %{?_smp_mflags}
 
 
@@ -48,12 +52,13 @@ make %{?_smp_mflags}
 %files
 %license LICENSE.LGPL
 %doc ChangeLog
-%{_libdir}/%{name}.so.*
+%{_libdir}/%{name}.so.4*
 
 %files devel
 %{_includedir}/ebml/
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
+%dir %{_libdir}/cmake/ebml
 %{_libdir}/cmake/ebml/EbmlConfig.cmake
 %{_libdir}/cmake/ebml/EbmlConfigVersion.cmake
 %{_libdir}/cmake/ebml/EbmlTargets-noconfig.cmake
@@ -61,6 +66,11 @@ make %{?_smp_mflags}
 
 
 %changelog
+* Fri Jun 07 2019 Dominik Mierzejewski <rpm@greysector.net> - 1.3.7-1
+- update to 1.3.7
+- unbundle utf8cpp
+- fix unowned %%{_libdir}/cmake/ebml directory
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (libebml-1.3.6.tar.xz) = 6a31a56dcde39642848f25353a462f4621d6cfd3bc9ef62add1b00d098c6a80b3c2b50ecf4d6dd50650c609eb39a6150c6d1b69ea3a77a3928bd3300af7dd91f
+SHA512 (libebml-1.3.7.tar.xz) = ad574a73a1d2c5fbd4581991ff790ef22cfcaf5645295b06dce36235b43d552bbec3b400d3c80550c8020ed3720226fad05348c6034c444da1106439c7fd9fc1