From d3bd998a8fe715a245186328d7e9f9df755b2fa6 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: May 04 2022 23:13:33 +0000 Subject: Merge branch 'f35' into f36 --- diff --git a/.gitignore b/.gitignore index 07e8bca..79a3f23 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,5 @@ /mkvtoolnix-65.0.0.tar.xz.sig /mkvtoolnix-66.0.0.tar.xz /mkvtoolnix-66.0.0.tar.xz.sig +/mkvtoolnix-67.0.0.tar.xz +/mkvtoolnix-67.0.0.tar.xz.sig diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec index 6f0433e..d8d8b8b 100644 --- a/mkvtoolnix.spec +++ b/mkvtoolnix.spec @@ -1,6 +1,6 @@ Summary: Matroska container manipulation utilities Name: mkvtoolnix -Version: 66.0.0 +Version: 67.0.0 Release: 1%{?dist} License: GPLv2+ Source0: https://mkvtoolnix.download/sources/mkvtoolnix-%{version}.tar.xz @@ -12,6 +12,7 @@ BuildRequires: cmake(Qt6Concurrent) BuildRequires: cmake(Qt6Core) BuildRequires: cmake(Qt6DBus) BuildRequires: cmake(Qt6Gui) +BuildRequires: cmake(Qt6Multimedia) BuildRequires: cmake(Qt6Network) BuildRequires: cmake(Qt6Widgets) BuildRequires: desktop-file-utils @@ -54,7 +55,6 @@ streams into and from Matroska containers. Summary: QT Graphical interface for Matroska container manipulation Requires: %{name} = %{version}-%{release} Requires: hicolor-icon-theme -Requires: oxygen-sound-theme %description gui Mkvtoolnix is a set of utilities to mux and demux audio, video and subtitle @@ -83,11 +83,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.bunkus.mkv install -pm 755 src/tools/{base64tool,diracparser,ebml_validator,vc1parser} $RPM_BUILD_ROOT%{_bindir} -rm %{buildroot}%{_datadir}/%{name}/sounds/finished-{1,2,3}.ogg -ln -s ../../sounds/Oxygen-K3B-Insert-Medium.ogg %{buildroot}%{_datadir}/%{name}/sounds/finished-1.ogg -ln -s ../../sounds/Oxygen-K3B-Finish-Success.ogg %{buildroot}%{_datadir}/%{name}/sounds/finished-2.ogg -ln -s ../../sounds/Oxygen-K3B-Finish-Error.ogg %{buildroot}%{_datadir}/%{name}/sounds/finished-3.ogg - %find_lang %{name} %find_lang mkvextract --with-man %find_lang mkvmerge --with-man @@ -126,8 +121,14 @@ drake tests:run_unit %{_datadir}/mkvtoolnix %changelog +* Wed May 04 2022 Dominik Mierzejewski - 67.0.0-1 +- update to 67.0.0 (#2073819) +- sounds were converted to webm/opus format, drop oxygen-sound theme requirement +- add missing build dependency on Qt6Multimedia + * Tue Mar 15 2022 Dominik Mierzejewski - 66.0.0-1 - update to 66.0.0 (#2063542) +- drop obsolete patch * Sun Mar 06 2022 Dominik Mierzejewski - 65.0.0-2 - enable s390x builds (#2012824) diff --git a/sources b/sources index 09bbf9f..cb101c7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mkvtoolnix-66.0.0.tar.xz) = d519e107b16a9bfa73309aef1df613c7a594b534199c53a220383d1c514cf81c3df294db8eeccce7ea0f77695ce49ebd81609b05f2fc30d1ab6287baccd21bbb -SHA512 (mkvtoolnix-66.0.0.tar.xz.sig) = 5a79b5c466f2d43b85910fa0292e212688f6ddbb6fae833d18300e6bd9b8e81890490dd892f66350391481ca26948bea10425f266a6379c2ae81269af0e78c37 +SHA512 (mkvtoolnix-67.0.0.tar.xz) = eed390cb305b5fcaddf11d68a9021f9ddc22a62d1eb95f4c0a34161a7662dd62495c87193a2d951f0fe30fb9a6b5b93f06ed7fedc24ed674da531f2c2317c997 +SHA512 (mkvtoolnix-67.0.0.tar.xz.sig) = 7f8dd4f813fd7f487cda9623afd2b3afb94539d765c822ac6523df4d1d935a63baeca2e0a2bd02525fcadc18b9690ff7574d2952a7b45557e5c4ee52f64260f9