diff --git a/.gitignore b/.gitignore index d503e30..12cdb6d 100644 --- a/.gitignore +++ b/.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 diff --git a/libebml-use-system-utf8cpp.patch b/libebml-use-system-utf8cpp.patch new file mode 100644 index 0000000..3003e1a --- /dev/null +++ b/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 + + START_LIBEBML_NAMESPACE + diff --git a/libebml.spec b/libebml.spec index 33bc592..43ea347 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,13 +1,15 @@ Summary: Extensible Binary Meta Language library Name: libebml -Version: 1.3.6 +Version: 1.3.7 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz +Patch0: %{name}-use-system-utf8cpp.patch BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: utf8cpp-devel %description Extensible Binary Meta Language access library A library for reading @@ -33,6 +35,8 @@ will use the Extensible Binary Meta Language library. %prep %setup -q +%patch0 -p1 -b .utf8cpp +rm -r src/lib/utf8-cpp %build @@ -63,6 +67,10 @@ make %{?_smp_mflags} %changelog +* Fri Jun 07 2019 Dominik Mierzejewski - 1.3.7-1 +- update to 1.3.7 +- unbundle utf8cpp + * Mon Jul 23 2018 Dominik Mierzejewski - 1.3.6-1 - update to 1.3.6 (#1570224) - add BR: gcc for https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot diff --git a/sources b/sources index a9eb27c..405aaa0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libebml-1.3.6.tar.xz) = 6a31a56dcde39642848f25353a462f4621d6cfd3bc9ef62add1b00d098c6a80b3c2b50ecf4d6dd50650c609eb39a6150c6d1b69ea3a77a3928bd3300af7dd91f +SHA512 (libebml-1.3.7.tar.xz) = ad574a73a1d2c5fbd4581991ff790ef22cfcaf5645295b06dce36235b43d552bbec3b400d3c80550c8020ed3720226fad05348c6034c444da1106439c7fd9fc1