diff --git a/.gitignore b/.gitignore index e63443b..2a2d373 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtlocation-everywhere-src-5.11.1.tar.xz +SOURCES/qtlocation-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qtlocation.metadata b/.qt5-qtlocation.metadata index 899f320..65708ae 100644 --- a/.qt5-qtlocation.metadata +++ b/.qt5-qtlocation.metadata @@ -1 +1 @@ -77b06f3baf6f5d582fe5455d7657e181ad2f55b1 SOURCES/qtlocation-everywhere-src-5.11.1.tar.xz +bf9f000f1325d668e795e2f2e0963c631e0feed1 SOURCES/qtlocation-everywhere-src-5.12.5.tar.xz diff --git a/SPECS/qt5-qtlocation.spec b/SPECS/qt5-qtlocation.spec index 6a7ed51..425d8f5 100644 --- a/SPECS/qt5-qtlocation.spec +++ b/SPECS/qt5-qtlocation.spec @@ -1,9 +1,11 @@ %global qt_module qtlocation +%global build_tests 1 + Summary: Qt5 - Location 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, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -45,6 +47,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} @@ -56,9 +66,26 @@ 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} @@ -115,8 +142,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#1733143 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-2 - Rebuild to fix CET notes Resolves: bz#1657251