From 362b6c68cab927aa1835d00a9b9ee1de28187dc5 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 9 Jun 2019 23:03:42 +0200 Subject: [PATCH 1/3] update to 1.5.0 --- .gitignore | 1 + libmatroska.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7c206af..30313c9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ libmatroska-1.0.0.tar.bz2 /libmatroska-1.4.7.tar.bz2 /libmatroska-1.4.8.tar.xz /libmatroska-1.4.9.tar.xz +/libmatroska-1.5.0.tar.xz diff --git a/libmatroska.spec b/libmatroska.spec index 7839dce..4cd6198 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -1,6 +1,6 @@ Summary: Open audio/video container format library Name: libmatroska -Version: 1.4.9 +Version: 1.5.0 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -8,7 +8,8 @@ URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libebml-devel >= 1.3.6 +BuildRequires: libebml-devel >= 1.3.7 +Requires: libebml%{_isa} >= 1.3.7 %description Matroska is an extensible open standard Audio/Video container. It @@ -22,7 +23,7 @@ Summary: Matroska container format library development files Group: Development/Libraries Requires: %{name}%{_isa} = %{version}-%{release} Requires: cmake-filesystem -Requires: libebml-devel >= 1.3.6 +Requires: libebml-devel >= 1.3.7 Requires: pkgconfig %description devel @@ -54,7 +55,7 @@ will use the Matroska container format. %files %license LICENSE.LGPL %doc ChangeLog -%{_libdir}/%{name}.so.* +%{_libdir}/%{name}.so.6* %files devel %{_includedir}/matroska/ @@ -67,6 +68,9 @@ will use the Matroska container format. %changelog +* Sat Jun 08 2019 Dominik Mierzejewski - 1.5.0-1 +- update to 1.5.0 + * Tue Jul 24 2018 Dominik Mierzejewski - 1.4.9-1 - update to 1.4.9 (#1570226) - switch build system to cmake, add missing dependencies diff --git a/sources b/sources index 72990fa..4a9e637 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libmatroska-1.4.9.tar.xz) = 281224b66ce7ef39daf0f186cda1144250e190b914e64f4f2524e8bf0170a3d18dbc50f204d4ca8d7eaffe183a61f96c92ba6ec4325bacb068272d62cdbcef33 +SHA512 (libmatroska-1.5.0.tar.xz) = eb59b5afd9d510c2d6c7408b0053a261cee6669a9f5bbb1a939d98d96ac6c9b8f340691e95310268f59c954a1d9f72322fd0ec7b442a74c56cd2e2c22eb3a754 From 7aae903941c6e278372565211ca3e79ef4c11875 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 9 Jun 2019 23:04:18 +0200 Subject: [PATCH 2/3] backport fixes for invalid memory access and null pointer dereference --- libmatroska.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libmatroska.spec b/libmatroska.spec index 4cd6198..3567c48 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -6,6 +6,7 @@ License: LGPLv2+ Group: System Environment/Libraries URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz +Patch0: %{name}-memory.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libebml-devel >= 1.3.7 @@ -38,6 +39,7 @@ will use the Matroska container format. %prep %setup -q +%patch0 -p1 -b .m %build @@ -70,6 +72,7 @@ will use the Matroska container format. %changelog * Sat Jun 08 2019 Dominik Mierzejewski - 1.5.0-1 - update to 1.5.0 +- backport fixes for invalid memory access and null pointer dereference * Tue Jul 24 2018 Dominik Mierzejewski - 1.4.9-1 - update to 1.4.9 (#1570226) From 8fe3f6f153f28686b90a3b2c30491919000c2cac Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 10 Jun 2019 01:08:32 +0200 Subject: [PATCH 3/3] support both EL7 and Fedora Use %cmake3 macro and %{_libdir}/cmake as dependency because there's no cmake3-filesystem package in EL7. Also, fix unowned %{_libdir}/cmake/ebml directory. --- libmatroska.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libmatroska.spec b/libmatroska.spec index 3567c48..1dfbac5 100644 --- a/libmatroska.spec +++ b/libmatroska.spec @@ -7,7 +7,7 @@ Group: System Environment/Libraries URL: https://www.matroska.org/ Source0: https://dl.matroska.org/downloads/%{name}/%{name}-%{version}.tar.xz Patch0: %{name}-memory.patch -BuildRequires: cmake +BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: libebml-devel >= 1.3.7 Requires: libebml%{_isa} >= 1.3.7 @@ -23,7 +23,7 @@ is usually found as .mkv files (matroska video) and .mka files Summary: Matroska container format library development files Group: Development/Libraries Requires: %{name}%{_isa} = %{version}-%{release} -Requires: cmake-filesystem +Requires: %{_libdir}/cmake Requires: libebml-devel >= 1.3.7 Requires: pkgconfig @@ -43,7 +43,7 @@ will use the Matroska container format. %build -%cmake +%cmake3 . %make_build @@ -63,6 +63,7 @@ will use the Matroska container format. %{_includedir}/matroska/ %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc +%dir %{_libdir}/cmake/matroska %{_libdir}/cmake/matroska/MatroskaConfig.cmake %{_libdir}/cmake/matroska/MatroskaConfigVersion.cmake %{_libdir}/cmake/matroska/MatroskaTargets-noconfig.cmake @@ -73,6 +74,7 @@ will use the Matroska container format. * Sat Jun 08 2019 Dominik Mierzejewski - 1.5.0-1 - update to 1.5.0 - backport fixes for invalid memory access and null pointer dereference +- fix unowned %{_libdir}/cmake/ebml directory * Tue Jul 24 2018 Dominik Mierzejewski - 1.4.9-1 - update to 1.4.9 (#1570226)