From de99f67a30dd6b3dc0c83d73c04d874f90fdd2aa Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 22 Jan 2020 06:56:06 -0500 Subject: [PATCH] import qt5-qtgraphicaleffects-5.12.5-1.el8 --- .gitignore | 2 +- .qt5-qtgraphicaleffects.metadata | 2 +- SPECS/qt5-qtgraphicaleffects.spec | 40 ++++++++++++++++++++++++++++--- 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bf896ce..399e547 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtgraphicaleffects-everywhere-src-5.11.1.tar.xz +SOURCES/qtgraphicaleffects-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qtgraphicaleffects.metadata b/.qt5-qtgraphicaleffects.metadata index 7031987..700f518 100644 --- a/.qt5-qtgraphicaleffects.metadata +++ b/.qt5-qtgraphicaleffects.metadata @@ -1 +1 @@ -8a4035abc706b7eea9d6f4b168594735c84baa9b SOURCES/qtgraphicaleffects-everywhere-src-5.11.1.tar.xz +04b9e74a4ea1151a3d85a7d8cfff2f302b9e3ab8 SOURCES/qtgraphicaleffects-everywhere-src-5.12.5.tar.xz diff --git a/SPECS/qt5-qtgraphicaleffects.spec b/SPECS/qt5-qtgraphicaleffects.spec index caa8653..bbb2089 100644 --- a/SPECS/qt5-qtgraphicaleffects.spec +++ b/SPECS/qt5-qtgraphicaleffects.spec @@ -1,9 +1,11 @@ %global qt_module qtgraphicaleffects +%global build_tests 1 + Summary: Qt5 - QtGraphicalEffects component 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 from qt5-qtbase for details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -29,6 +31,15 @@ visually impressive and configurable effects to user interfaces. Effects are visual items that can be added to Qt Quick user interface as UI components. +%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} @@ -37,19 +48,42 @@ components. %build %{qmake_qt5} -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 %files %license LICENSE.* %{_qt5_qmldir}/QtGraphicalEffects/ +%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#1733141 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-2 - Rebuild to fix CET notes Resolves: bz#1657235