From 2bb32232aa7c16a029072b94893809be1445c3ad Mon Sep 17 00:00:00 2001 From: tigro Date: Wed, 25 Dec 2024 23:21:47 +0300 Subject: [PATCH] import qt5-qtmultimedia-5.15.15-1.el10 --- .gitignore | 2 +- .qt5-qtmultimedia.metadata | 2 +- SOURCES/qtmultimedia-python-shebang.patch | 10 -- SPECS/qt5-qtmultimedia.spec | 114 +++++++++++++--------- 4 files changed, 71 insertions(+), 57 deletions(-) delete mode 100644 SOURCES/qtmultimedia-python-shebang.patch diff --git a/.gitignore b/.gitignore index ebecb45..affc987 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtmultimedia-everywhere-opensource-src-5.15.9.tar.xz +SOURCES/qtmultimedia-everywhere-opensource-src-5.15.15.tar.xz diff --git a/.qt5-qtmultimedia.metadata b/.qt5-qtmultimedia.metadata index cb4e59f..4ffa361 100644 --- a/.qt5-qtmultimedia.metadata +++ b/.qt5-qtmultimedia.metadata @@ -1 +1 @@ -e52b8b8482bc62232cf1b738f58f2e5747c29f0d SOURCES/qtmultimedia-everywhere-opensource-src-5.15.9.tar.xz +2ba6b01558912348908fda082b81fd62987d4847 SOURCES/qtmultimedia-everywhere-opensource-src-5.15.15.tar.xz diff --git a/SOURCES/qtmultimedia-python-shebang.patch b/SOURCES/qtmultimedia-python-shebang.patch deleted file mode 100644 index dc57bd5..0000000 --- a/SOURCES/qtmultimedia-python-shebang.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/tests/auto/runautotests.py b/tests/auto/runautotests.py -index ba277e9..162dd1d 100755 ---- a/tests/auto/runautotests.py -+++ b/tests/auto/runautotests.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /usr/bin/python3 - ############################################################################# - ## - ## Copyright (C) 2016 The Qt Company Ltd. diff --git a/SPECS/qt5-qtmultimedia.spec b/SPECS/qt5-qtmultimedia.spec index a9e969a..ef21053 100644 --- a/SPECS/qt5-qtmultimedia.spec +++ b/SPECS/qt5-qtmultimedia.spec @@ -7,21 +7,17 @@ %global gst 1.0 %endif -%global build_tests 1 - Summary: Qt5 - Multimedia support Name: qt5-%{qt_module} -Version: 5.15.9 +Version: 5.15.15 Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details -License: LGPLv2 with exceptions or GPLv3 with exceptions +License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz - -Patch0: qtmultimedia-python-shebang.patch -Patch1: %{name}-gcc11.patch +Patch0: %{name}-gcc11.patch # filter plugin/qml provides %global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$ @@ -76,20 +72,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description examples %{summary}. -%if 0%{?build_tests} -%package tests -Summary: Unit tests for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description tests -%{summary}. -%endif %prep -%setup -q -n %{qt_module}-everywhere-src-%{version} +%autosetup -n %{qt_module}-everywhere-src-%{version} -p1 -%patch0 -p1 -%patch1 -p1 %build %{qmake_qt5} \ @@ -98,17 +84,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %make_build -%if 0%{?build_tests} -%qt5_build_tests -%endif %install make install INSTALL_ROOT=%{buildroot} -%if 0%{?build_tests} -%qt5_install_tests -%endif - ## .prl/.la file love # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs pushd %{buildroot}%{_qt5_libdir} @@ -168,34 +147,79 @@ popd %{_qt5_examplesdir}/ %endif -%if 0%{?build_tests} -%files tests -%{_qt5_libdir}/qt5/tests -%endif %changelog -* Tue Apr 18 2023 Jan Grulich - 5.15.9-1 +* Wed Dec 25 2024 Arkady L. Shane - 5.15.15-1 +- Rebuilt for MSVSphere 10 + +* Wed Sep 04 2024 Jan Grulich - 5.15.15-1 +- 5.15.15 + +* Fri Jul 19 2024 Fedora Release Engineering - 5.15.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed May 29 2024 Jan Grulich - 5.15.14-1 +- 5.15.14 + +* Sat May 25 2024 Fabio Valentini - 5.15.13-2 +- Rebuild for gstreamer-plugins-bad 1.24. + +* Thu Mar 14 2024 Jan Grulich - 5.15.13-1 +- 5.15.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 5.15.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 5.15.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Jan 02 2024 Jan Grulich - 5.15.12-1 +- 5.15.12 + +* Fri Oct 06 2023 Jan Grulich - 5.15.11-1 +- 5.15.11 + +* Fri Jul 21 2023 Fedora Release Engineering - 5.15.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 12 2023 Jan Grulich - 5.15.10-1 +- 5.15.10 + +* Tue Apr 11 2023 Jan Grulich - 5.15.9-1 - 5.15.9 - Resolves: bz#2175736 -* Mon Mar 28 2022 Jan Grulich - 5.15.3-1 -- 5.15.3 - Resolves: bz#2061361 +* Tue Jan 31 2023 Jan Grulich - 5.15.8-3 +- migrated to SPDX license -* Tue Aug 10 2021 Mohan Boddu - 5.15.2-7 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Fri Jan 20 2023 Fedora Release Engineering - 5.15.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Thu Jun 10 2021 Jan Grulich - 5.15.2-6 -- Let qt5_install_tests macro handle mangling python shebangs - Resolves: bz#1968467 +* Thu Jan 05 2023 Jan Grulich - 5.15.8-1 +- 5.15.8 + +* Mon Oct 31 2022 Jan Grulich - 5.15.7-1 +- 5.15.7 + +* Tue Sep 20 2022 Jan Grulich - 5.15.6-1 +- 5.15.6 + +* Sat Jul 23 2022 Fedora Release Engineering - 5.15.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 5.15.5-1 +- 5.15.5 + +* Mon May 16 2022 Jan Grulich - 5.15.4-1 +- 5.15.4 + +* Fri Mar 04 2022 Jan Grulich - 5.15.3-1 +- 5.15.3 -* Wed Jun 09 2021 Jan Grulich - 5.15.2-5 -- Add gating tests - Resolves: bz#1968467 +* Fri Jan 21 2022 Fedora Release Engineering - 5.15.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Fri Apr 16 2021 Mohan Boddu - 5.15.2-4 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Fri Jul 23 2021 Fedora Release Engineering - 5.15.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * Wed Jan 27 2021 Fedora Release Engineering - 5.15.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild