From 7e73862a6b64f7e014abb097779a56be9d766a05 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 21 2020 22:59:43 +0000 Subject: import qt5-qtwebchannel-5.12.5-1.el8 --- diff --git a/.gitignore b/.gitignore index a886c67..9fd6178 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtwebchannel-everywhere-src-5.11.1.tar.xz +SOURCES/qtwebchannel-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qtwebchannel.metadata b/.qt5-qtwebchannel.metadata index 7981e69..211176b 100644 --- a/.qt5-qtwebchannel.metadata +++ b/.qt5-qtwebchannel.metadata @@ -1 +1 @@ -9c257b055323a74bf12cf81e96d07e305cb395d4 SOURCES/qtwebchannel-everywhere-src-5.11.1.tar.xz +12c7b4c73c5b8a7f02e36aa12ddf58779eafd28c SOURCES/qtwebchannel-everywhere-src-5.12.5.tar.xz diff --git a/SPECS/qt5-qtwebchannel.spec b/SPECS/qt5-qtwebchannel.spec index aa98b2c..67b3cb4 100644 --- a/SPECS/qt5-qtwebchannel.spec +++ b/SPECS/qt5-qtwebchannel.spec @@ -1,9 +1,11 @@ %global qt_module qtwebchannel +%global build_tests 1 + Summary: Qt5 - WebChannel component Name: qt5-%{qt_module} -Version: 5.11.1 -Release: 2%{?dist} +Version: 5.12.5 +Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -36,6 +38,16 @@ 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} @@ -45,10 +57,27 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %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 @@ -84,8 +113,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#1733155 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-2 - Rebuild to fix CET notes Resolves: bz#1657242