From fe0d8cc4c420de8235b437e5cef66797d569157b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 21 2020 22:21:22 +0000 Subject: import qt5-qtcanvas3d-5.12.5-1.el8 --- diff --git a/.gitignore b/.gitignore index cb9440e..e80e406 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtcanvas3d-everywhere-src-5.11.1.tar.xz +SOURCES/qtcanvas3d-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qtcanvas3d.metadata b/.qt5-qtcanvas3d.metadata index 23f0595..08b651c 100644 --- a/.qt5-qtcanvas3d.metadata +++ b/.qt5-qtcanvas3d.metadata @@ -1 +1 @@ -9fa2e596cd0742cdd0d22d807ac449f50a41893f SOURCES/qtcanvas3d-everywhere-src-5.11.1.tar.xz +699d4d5ed1e827df9e05bf0987482c7a77e01a25 SOURCES/qtcanvas3d-everywhere-src-5.12.5.tar.xz diff --git a/SPECS/qt5-qtcanvas3d.spec b/SPECS/qt5-qtcanvas3d.spec index 890c491..dee9ef0 100644 --- a/SPECS/qt5-qtcanvas3d.spec +++ b/SPECS/qt5-qtcanvas3d.spec @@ -1,15 +1,18 @@ %global qt_module qtcanvas3d +%global build_tests 1 + Summary: Qt5 - Canvas3d component Name: qt5-%{qt_module} -Version: 5.11.1 -Release: 2%{?dist} +Version: 5.12.5 +Release: 1%{?dist} License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz +BuildRequires: qt5-rpm-macros >= %{version} BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-static BuildRequires: qt5-qtbase-private-devel @@ -26,6 +29,15 @@ 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} @@ -36,10 +48,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 + %files %license LICENSE.* @@ -50,8 +79,17 @@ make install INSTALL_ROOT=%{buildroot} %{_qt5_examplesdir}/canvas3d/ %endif +%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#1733136 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-2 - Rebuild to fix CET notes Resolves: bz#1657233