From 962eb948ef21e06fde72e168381e8d6473db6e63 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 21 Jan 2020 14:15:39 -0500 Subject: [PATCH] import qt5-qtquickcontrols2-5.12.5-1.el8 --- .gitignore | 2 +- .qt5-qtquickcontrols2.metadata | 2 +- SPECS/qt5-qtquickcontrols2.spec | 43 +++++++++++++++++++++++++++++++-- 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c19bc78..5f64fb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtquickcontrols2-everywhere-src-5.11.1.tar.xz +SOURCES/qtquickcontrols2-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qtquickcontrols2.metadata b/.qt5-qtquickcontrols2.metadata index 57be2ab..60823b2 100644 --- a/.qt5-qtquickcontrols2.metadata +++ b/.qt5-qtquickcontrols2.metadata @@ -1 +1 @@ -8ea9c7655f82bbae02a9c203c4c022b693a45953 SOURCES/qtquickcontrols2-everywhere-src-5.11.1.tar.xz +47181ff0fce645548603337c205c1f36d34fc2a7 SOURCES/qtquickcontrols2-everywhere-src-5.12.5.tar.xz diff --git a/SPECS/qt5-qtquickcontrols2.spec b/SPECS/qt5-qtquickcontrols2.spec index 0fd471e..1239600 100644 --- a/SPECS/qt5-qtquickcontrols2.spec +++ b/SPECS/qt5-qtquickcontrols2.spec @@ -1,9 +1,11 @@ %global qt_module qtquickcontrols2 +%global build_tests 1 + Name: qt5-%{qt_module} Summary: Qt5 - module with set of QtQuick controls for embedded -Version: 5.11.1 -Release: 2%{?dist} +Version: 5.12.5 +Release: 1%{?dist} License: GPLv2+ or LGPLv3 and GFDL Url: http://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) @@ -46,6 +48,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 %setup -q -n %{qt_module}-everywhere-src-%{version} @@ -56,10 +67,28 @@ 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 pushd %{buildroot}%{_qt5_libdir} @@ -99,9 +128,19 @@ rm -f %{buildroot}%{_qt5_libdir}/libQt5*.la %{_qt5_libdir}/libQt5QuickControls2.prl %{_qt5_libdir}/qt5/mkspecs/modules/* %{_libdir}/cmake/Qt5QuickControls2/ +%{_libdir}/cmake/Qt5QuickTemplates2/ + +%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#1733146 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-2 - Rebuild to fix CET notes Resolves: bz#1657248