commit 0ec1037810b607af85f5d17412db60201bfabdc9 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Mon Aug 22 22:45:38 2022 +0100 Update to 22.08.21 .gitignore | 1 + ffmpeg51.patch | 11 ----------- qmplay2.spec | 41 ++++++++++++++++++++++++----------------- sources | 2 +- 4 files changed, 26 insertions(+), 29 deletions(-) --- diff --git a/.gitignore b/.gitignore index 56605ee..7686ff2 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /QMPlay2-21.12.24.tar.gz /QMPlay2-22.03.19.tar.gz /QMPlay2-22.06.16.tar.gz +/QMPlay2-22.08.21.tar.gz diff --git a/qmplay2.spec b/qmplay2.spec index 4400f48..7e31fe5 100644 --- a/qmplay2.spec +++ b/qmplay2.spec @@ -2,18 +2,16 @@ %global pname QMPlay2 Name: qmplay2 -Version: 22.06.16 -Release: 2%{?dist} +Version: 22.08.21 +Release: 1%{?dist} Summary: A Qt based media player, streamer and downloader License: LGPLv3+ URL: http://zaps166.sourceforge.net/?app=QMPlay2 -Source: https://github.com/zaps166/QMPlay2/archive/%{version}.tar.gz#/%{pname}-%{... +Source: https://github.com/zaps166/QMPlay2/archive/%{version}/%{pname}-%{version}... Patch0: %{name}-numeric_limit_fix.patch -Patch1: ffmpeg51.patch BuildRequires: cmake BuildRequires: ninja-build -BuildRequires: kde-workspace-devel BuildRequires: pkgconfig(Qt5) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5Qml) @@ -42,6 +40,8 @@ BuildRequires: pkgconfig(vdpau) BuildRequires: pkgconfig(xv) Requires: youtube-dl Requires: hicolor-icon-theme +# Owns /usr/share/mime/packages/ +Requires: shared-mime-info %description %{name} is a video player, it can play and stream all formats supported by @@ -50,7 +50,8 @@ ffmpeg and libmodplug (including J2B). It has an integrated Youtube browser. %package kde-integration Summary: %{pname} KDE integration subpackage Requires: %{name} = %{version}-%{release} -Requires: kde-workspace-common +# Owns /usr/share/solid/actions/ +Requires: kf5-filesystem BuildArch: noarch %description kde-integration @@ -76,7 +77,10 @@ sed -i '12,33d' src/gui/Unix/QMPlay2.desktop #lrelease-qt5 QMPlay2.pro %cmake \ -DCMAKE_BUILD_TYPE='Debug' \ - -GNinja -DUSE_VULKAN=OFF -DSOLID_ACTIONS_INSTALL_PATH='/usr/share/solid/actions' + -GNinja \ + -DUSE_VULKAN=OFF \ + -DUSE_UPDATES=OFF \ + -DSOLID_ACTIONS_INSTALL_PATH='/usr/share/solid/actions' %cmake_build @@ -86,12 +90,12 @@ sed -i '12,33d' src/gui/Unix/QMPlay2.desktop %find_lang %{name} --all-name --with-qt # Let's use %%doc macro. AUTHORS & ChangeLog are required for help window -cd %{buildroot}/%{_datadir}/qmplay2 +cd %{buildroot}%{_datadir}/qmplay2/ rm LICENSE README.md AUTHORS ChangeLog -mkdir -p %{buildroot}%{_datadir}/appdata -mv %{buildroot}/%{_datadir}/metainfo/QMPlay2.appdata.xml \ - %{buildroot}/%{_metainfodir}/%{name}.appdata.xml +# Rename appdata file +mv %{buildroot}%{_metainfodir}/QMPlay2.appdata.xml \ + %{buildroot}%{_metainfodir}/%{name}.appdata.xml %check desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop @@ -103,25 +107,28 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml %doc AUTHORS ChangeLog README.md %license LICENSE %{_bindir}/%{pname} -%{_libdir}/%{name} +%{_libdir}/%{name}/ %{_libdir}/libqmplay2.so %{_datadir}/mime/packages/x-*.xml -%dir %{_datadir}/solid -%dir %{_datadir}/solid/actions %{_datadir}/applications/%{pname}*.desktop %{_metainfodir}/%{name}.appdata.xml %{_datadir}/icons/hicolor/*/apps/%{pname}.* -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/lang +%dir %{_datadir}/%{name}/ +%dir %{_datadir}/%{name}/lang/ %{_mandir}/man1/%{pname}.1* %files kde-integration %{_datadir}/solid/actions/*.desktop %files devel -%{_includedir}/%{pname} +%{_includedir}/%{pname}/ %changelog +* Mon Aug 22 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 22.08.21-1 +- Update to 22.08.21 +- Remove unused build requires and requires +- Clean up spec file + * Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 22.06.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index 23f141b..2058ea5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (QMPlay2-22.06.16.tar.gz) = f9bb7256d6139d3da01cc25a80aa46f3a6d19738489123f575a24595ea72e35e1714938b546a1f506aaf641d49aa6416c5fd53b34a3ee2fbe7ebb20cc643befc +SHA512 (QMPlay2-22.08.21.tar.gz) = 51fdd2f72714492530bf55065051fb9159676291dc4e40067a4f5db6a4ebb0952c3db53ac4200ad4dc3d4571ac835a39fe89cd6ea9cf6d036694b758a42c70df