From 4b36acf6b055f02c5cb9d5b8d574eaa514582b30 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Apr 2020 05:02:08 -0400 Subject: [PATCH] import qt5-qtserialport-5.12.5-1.el8 --- .gitignore | 2 +- .qt5-qtserialport.metadata | 2 +- SPECS/qt5-qtserialport.spec | 39 +++++++++++++++++++++++++++++++++++-- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f87913c..f979ccc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtserialport-everywhere-src-5.11.1.tar.xz +SOURCES/qtserialport-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qtserialport.metadata b/.qt5-qtserialport.metadata index 425aed2..e1621ab 100644 --- a/.qt5-qtserialport.metadata +++ b/.qt5-qtserialport.metadata @@ -1 +1 @@ -3371db4a50e8ee3c56cf928f61f31317354641a4 SOURCES/qtserialport-everywhere-src-5.11.1.tar.xz +8bc7ab77ea5a188b167da0da36bed5624085faad SOURCES/qtserialport-everywhere-src-5.12.5.tar.xz diff --git a/SPECS/qt5-qtserialport.spec b/SPECS/qt5-qtserialport.spec index b74e25e..a428b7c 100644 --- a/SPECS/qt5-qtserialport.spec +++ b/SPECS/qt5-qtserialport.spec @@ -1,9 +1,11 @@ %global qt_module qtserialport +%global build_tests 1 + Summary: Qt5 - SerialPort component Name: qt5-%{qt_module} -Version: 5.11.1 -Release: 3%{?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 @@ -34,6 +36,14 @@ 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 +55,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 pushd %{buildroot}%{_qt5_libdir} @@ -86,8 +113,16 @@ popd %files examples %{_qt5_examplesdir}/ +%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#1733150 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-3 - Rebuild for broken CI Resolves: bz#1657236