diff --git a/.gitignore b/.gitignore index a5dd444..28e7aab 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtconnectivity-everywhere-src-5.11.1.tar.xz +SOURCES/qtconnectivity-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qtconnectivity.metadata b/.qt5-qtconnectivity.metadata index 48a04d0..66d0da4 100644 --- a/.qt5-qtconnectivity.metadata +++ b/.qt5-qtconnectivity.metadata @@ -1 +1 @@ -29432e7b2c6077116b89d6b21c8ff5d848520897 SOURCES/qtconnectivity-everywhere-src-5.11.1.tar.xz +9aa4f3b1b42a694cdd3fb69014a901ce6ddc948a SOURCES/qtconnectivity-everywhere-src-5.12.5.tar.xz diff --git a/SPECS/qt5-qtconnectivity.spec b/SPECS/qt5-qtconnectivity.spec index 42f7fa3..c079889 100644 --- a/SPECS/qt5-qtconnectivity.spec +++ b/SPECS/qt5-qtconnectivity.spec @@ -1,9 +1,11 @@ %global qt_module qtconnectivity +%global build_tests 1 + Summary: Qt5 - Connectivity components Name: qt5-%{qt_module} -Version: 5.11.1 -Release: 2%{?dist} +Version: 5.12.5 +Release: 1%{?dist} # See LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -15,6 +17,8 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod %global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$ BuildRequires: qt5-qtbase-devel >= %{version} +BuildRequires: qt5-qtbase-private-devel >= %{version} +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} BuildRequires: qt5-qtdeclarative-devel >= %{version} BuildRequires: pkgconfig(bluez) @@ -34,6 +38,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} @@ -44,10 +56,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 + + %if 0%{?docs} make install_docs INSTALL_ROOT=%{buildroot} %endif @@ -107,8 +136,17 @@ popd %files examples %{_qt5_examplesdir}/ +%if 0%{?build_tests} +%files tests +%{_qt5_libdir}/qt5/tests +%endif + %changelog +* Thu Nov 07 2019 Jan Grulich - 5.12.5-1 +- 5.12.5 + Resolves: bz#1733137 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-2 - Rebuild to fix CET notes Resolves: bz#1657221