diff --git a/libebml-1.4.2.tar.xz b/libebml-1.4.2.tar.xz deleted file mode 100644 index 6fa50208b09be09c62b1b32c0c8dfd67384969c4..0000000000000000000000000000000000000000 Binary files a/libebml-1.4.2.tar.xz and /dev/null differ diff --git a/libebml-1.4.5.tar.xz b/libebml-1.4.5.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..376aadd9d898ddd0912f00f91644fb1639904e1a Binary files /dev/null and b/libebml-1.4.5.tar.xz differ diff --git a/libebml-gcc11.patch b/libebml-gcc11.patch deleted file mode 100644 index 859f76351f580362101cbc82dcdecd158369bb09..0000000000000000000000000000000000000000 --- a/libebml-gcc11.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up libebml-1.4.2/src/EbmlString.cpp.gcc11 libebml-1.4.2/src/EbmlString.cpp ---- libebml-1.4.2/src/EbmlString.cpp.gcc11 2021-02-18 12:42:59.000000000 +0100 -+++ libebml-1.4.2/src/EbmlString.cpp 2021-03-01 11:42:02.122854703 +0100 -@@ -34,6 +34,7 @@ - \author Steve Lhomme - */ - #include -+#include - - #include "ebml/EbmlString.h" - -diff -up libebml-1.4.2/src/EbmlUnicodeString.cpp.gcc11 libebml-1.4.2/src/EbmlUnicodeString.cpp ---- libebml-1.4.2/src/EbmlUnicodeString.cpp.gcc11 2021-03-01 11:42:02.121854696 +0100 -+++ libebml-1.4.2/src/EbmlUnicodeString.cpp 2021-03-01 11:42:21.772995170 +0100 -@@ -36,6 +36,7 @@ - */ - - #include -+#include - - #include "ebml/EbmlUnicodeString.h" - diff --git a/libebml-use-system-utf8cpp.patch b/libebml-use-system-utf8cpp.patch index 3003e1a6a79132609633c935817e7844d593b49a..cae9cc4e10e01391335c13f9cdb4e74ed5367d0d 100644 --- a/libebml-use-system-utf8cpp.patch +++ b/libebml-use-system-utf8cpp.patch @@ -1,12 +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 @@ +diff -up libebml-1.4.4/src/EbmlUnicodeString.cpp.utf8cpp libebml-1.4.4/src/EbmlUnicodeString.cpp +--- libebml-1.4.4/src/EbmlUnicodeString.cpp.utf8cpp 2022-10-11 13:11:14.129418820 +0200 ++++ libebml-1.4.4/src/EbmlUnicodeString.cpp 2022-10-11 13:11:44.405608490 +0200 +@@ -40,7 +40,7 @@ #include "ebml/EbmlUnicodeString.h" -#include "lib/utf8-cpp/source/utf8/checked.h" +#include - START_LIBEBML_NAMESPACE + namespace libebml { diff --git a/libebml.spec b/libebml.spec index 0a2db7eec1e630a8caf7fd124277b43c980403f8..7581a3201a6f8d30e8603e651c6de85f0580b2aa 100644 --- a/libebml.spec +++ b/libebml.spec @@ -1,13 +1,12 @@ Name: libebml -Version: 1.4.2 +Version: 1.4.5 Release: 1 Summary: Extensible Binary Meta Language library -License: LGPLv2+ +License: LGPL-2.1-or-later URL: https://www.matroska.org/ Source: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz Patch0: %{name}-use-system-utf8cpp.patch -Patch1: %{name}-gcc11.patch -BuildRequires: cmake3 gcc-c++ utf8cpp-devel +BuildRequires: cmake gcc-c++ utf8cpp-devel %description Extensible Binary Meta Language access library A library for reading @@ -18,8 +17,6 @@ pendant to XML. %package devel Summary: Development files for the Extensible Binary Meta Language library Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{_libdir}/cmake -Requires: pkgconfig %description devel Extensible Binary Meta Language access library A library for reading @@ -31,40 +28,30 @@ will use the Extensible Binary Meta Language library. %prep -%setup -q -%patch0 -p1 -b .utf8cpp -%patch1 -p1 -b .gcc11 +%autosetup -p1 -n %{name}-%{version} rm -r src/lib/utf8-cpp - %build -%cmake3 -%__cmake --build . - +%cmake +%cmake_build %install -%make_install - - -%ldconfig_scriptlets - +%cmake_install %files %license LICENSE.LGPL -%doc ChangeLog %{_libdir}/%{name}.so.5* %files devel -%{_includedir}/ebml/ +%{_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 -%{_libdir}/cmake/EBML/EBMLTargets.cmake +%{_libdir}/cmake/EBML %changelog +* Fri Nov 08 2024 Funda Wang - 1.4.5-1 +- update to 1.4.5 + * Fri Dec 10 2021 liweigang - 1.4.2-1 -- Init Package. \ No newline at end of file +- Init Package. diff --git a/libebml.yaml b/libebml.yaml new file mode 100644 index 0000000000000000000000000000000000000000..9eb0c0a032bed110e74955385c894477d9d6e8e9 --- /dev/null +++ b/libebml.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: Matroska-Org/libebml +tag_prefix: ^release- +separator: .