diff --git a/.gitignore b/.gitignore index fb493ff..b8f2bee 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtsensors-everywhere-src-5.11.1.tar.xz +SOURCES/qtsensors-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qtsensors.metadata b/.qt5-qtsensors.metadata index f5b3e30..6a8f5f4 100644 --- a/.qt5-qtsensors.metadata +++ b/.qt5-qtsensors.metadata @@ -1 +1 @@ -10f7f64a47c77063bff9b078a37dcd1ee827267f SOURCES/qtsensors-everywhere-src-5.11.1.tar.xz +419eae8046f1fdaf5c6ead5ea143c8c669bee295 SOURCES/qtsensors-everywhere-src-5.12.5.tar.xz diff --git a/SPECS/qt5-qtsensors.spec b/SPECS/qt5-qtsensors.spec index 094f507..98a887e 100644 --- a/SPECS/qt5-qtsensors.spec +++ b/SPECS/qt5-qtsensors.spec @@ -1,9 +1,11 @@ %global qt_module qtsensors +%global build_tests 1 + Summary: Qt5 - Sensors 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 @@ -37,6 +39,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,12 +55,28 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %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 + ## .prl/.la file love # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs pushd %{buildroot}%{_qt5_libdir} @@ -63,8 +89,7 @@ for prl_file in libQt5*.prl ; do done popd -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license LICENSE.GPL* LICENSE.LGPL* @@ -86,8 +111,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#1733148 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-2 - Rebuild to fix CET notes Resolves: bz#1657245