From ca018ae3eb3bf555d7336376abde81da1b05ef5d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Apr 2020 05:01:17 -0400 Subject: [PATCH] import qt5-qtquickcontrols-5.12.5-1.el8 --- .gitignore | 2 +- .qt5-qtquickcontrols.metadata | 2 +- SPECS/qt5-qtquickcontrols.spec | 38 ++++++++++++++++++++++++++++++++-- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ae888ed..c82f208 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtquickcontrols-everywhere-src-5.11.1.tar.xz +SOURCES/qtquickcontrols-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qtquickcontrols.metadata b/.qt5-qtquickcontrols.metadata index ef6060b..10d3d41 100644 --- a/.qt5-qtquickcontrols.metadata +++ b/.qt5-qtquickcontrols.metadata @@ -1 +1 @@ -59bba0d3c771119b72000ad91e9963ea75fd3953 SOURCES/qtquickcontrols-everywhere-src-5.11.1.tar.xz +1b30512d997c5f16ac69cf71293b90640e2290f4 SOURCES/qtquickcontrols-everywhere-src-5.12.5.tar.xz diff --git a/SPECS/qt5-qtquickcontrols.spec b/SPECS/qt5-qtquickcontrols.spec index f6399cb..0554745 100644 --- a/SPECS/qt5-qtquickcontrols.spec +++ b/SPECS/qt5-qtquickcontrols.spec @@ -1,9 +1,11 @@ %global qt_module qtquickcontrols +%global build_tests 1 + Name: qt5-%{qt_module} Summary: Qt5 - module with set of QtQuick controls -Version: 5.11.1 -Release: 2%{?dist} +Version: 5.12.5 +Release: 1%{?dist} License: LGPLv2 or LGPLv3 and GFDL Url: http://www.qt.io @@ -32,6 +34,15 @@ 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 %autosetup -n %{qt_module}-everywhere-src-%{version} -p1 @@ -42,10 +53,25 @@ 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 %files %license LICENSE.* @@ -56,8 +82,16 @@ make install INSTALL_ROOT=%{buildroot} %{_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#1733145 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-2 - Rebuild to fix CET notes Resolves: bz#1657243