diff --git a/.gitignore b/.gitignore index a75b6b6..e58d940 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtmultimedia-everywhere-src-5.11.1.tar.xz +SOURCES/qtmultimedia-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qtmultimedia.metadata b/.qt5-qtmultimedia.metadata index 655b78b..2c42e81 100644 --- a/.qt5-qtmultimedia.metadata +++ b/.qt5-qtmultimedia.metadata @@ -1 +1 @@ -52f57f28406a89c4e74d4568c63624563c2acf1c SOURCES/qtmultimedia-everywhere-src-5.11.1.tar.xz +7b43e23781b95d47744a766bb8bbf6f07b949f57 SOURCES/qtmultimedia-everywhere-src-5.12.5.tar.xz diff --git a/SOURCES/qtmultimedia-python-shebang.patch b/SOURCES/qtmultimedia-python-shebang.patch new file mode 100644 index 0000000..dc57bd5 --- /dev/null +++ b/SOURCES/qtmultimedia-python-shebang.patch @@ -0,0 +1,10 @@ +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 11e4545..e21dbf4 100644 --- a/SPECS/qt5-qtmultimedia.spec +++ b/SPECS/qt5-qtmultimedia.spec @@ -7,16 +7,20 @@ %global gst 1.0 %endif +%global build_tests 1 + Summary: Qt5 - Multimedia support Name: qt5-%{qt_module} -Version: 5.11.1 -Release: 2%{?dist} +Version: 5.12.5 +Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions 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-src-%{version}.tar.xz +Patch0: qtmultimedia-python-shebang.patch + # filter plugin/qml provides %global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$ @@ -66,22 +70,47 @@ 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} +%patch0 -p1 %build %{qmake_qt5} \ CONFIG+=git_build \ GST_VERSION=%{gst} -make %{?_smp_mflags} - +%make_build + +%if 0%{?build_tests} +make sub-tests %{?_smp_mflags} -k ||: +%endif %install make install INSTALL_ROOT=%{buildroot} +%if 0%{?build_tests} +# Install tests for gating +mkdir -p %{buildroot}%{_qt5_libdir}/qt5 +find ./tests -not -path '*/\.*' -type d | while read LINE +do + mkdir -p "%{buildroot}%{_qt5_libdir}/qt5/$LINE" +done +find ./tests -not -path '*/\.*' -not -name '*.h' -not -name '*.cpp' -not -name '*.pro' -not -name 'uic_wrapper.sh' -not -name 'Makefile' -not -name 'target_wrapper.sh' -type f | while read LINE +do + cp -r --parents "$LINE" %{buildroot}%{_qt5_libdir}/qt5/ +done +%endif + ## .prl/.la file love # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs pushd %{buildroot}%{_qt5_libdir} @@ -94,9 +123,8 @@ for prl_file in *.prl ; do done popd +%ldconfig_scriptlets -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig %files %license LICENSE.* @@ -140,8 +168,16 @@ popd %{_qt5_examplesdir}/ %endif +%if 0%{?build_tests} +%files tests +%{_qt5_libdir}/qt5/tests +%endif %changelog +* Mon Nov 18 2019 Jan Grulich - 5.12.5-1 +- 5.12.5 + Resolves: bz#1733144 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-2 - Rebuild to fix CET notes Resolves: bz#1657249