From cf6f8d30b5a329257e8f13fb86c1ed2cc16f2091 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 21 Jan 2020 13:37:48 -0500 Subject: [PATCH] import qt5-qtx11extras-5.12.5-1.el8 --- .gitignore | 2 +- .qt5-qtx11extras.metadata | 2 +- SPECS/qt5-qtx11extras.spec | 41 +++++++++++++++++++++++++++++++++++--- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9a317a4..6ecc411 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtx11extras-everywhere-src-5.11.1.tar.xz +SOURCES/qtx11extras-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qtx11extras.metadata b/.qt5-qtx11extras.metadata index cddc0c1..7787a8d 100644 --- a/.qt5-qtx11extras.metadata +++ b/.qt5-qtx11extras.metadata @@ -1 +1 @@ -929e3ede9ca9a03e7fc297c2f71e033ed0dcc036 SOURCES/qtx11extras-everywhere-src-5.11.1.tar.xz +b14b1b7f07669a09695541a178d53f102d6caf6a SOURCES/qtx11extras-everywhere-src-5.12.5.tar.xz diff --git a/SPECS/qt5-qtx11extras.spec b/SPECS/qt5-qtx11extras.spec index c8511a9..8d9a37b 100644 --- a/SPECS/qt5-qtx11extras.spec +++ b/SPECS/qt5-qtx11extras.spec @@ -1,9 +1,11 @@ %global qt_module qtx11extras +%global build_tests 1 + Summary: Qt5 - X11 support library 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 @@ -27,6 +29,15 @@ Requires: qt5-qtbase-devel%{?_isa} %description devel %{summary}. +%if 0%{?build_tests} +%package tests +Summary: Unit tests for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tests +%{summary}. +%endif + %prep %autosetup -n %{qt_module}-everywhere-src-%{version} @@ -37,10 +48,26 @@ Requires: qt5-qtbase-devel%{?_isa} %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} @@ -57,7 +84,7 @@ popd %ldconfig_scriptlets %files -%license LGPL_EXCEPTION.txt LICENSE.LGPL* +%license LICENSE.GPL3-EXCEPT LICENSE.LGPL* LICENSE.GPL* %{_qt5_libdir}/libQt5X11Extras.so.5* %files devel @@ -69,8 +96,16 @@ popd %{_qt5_libdir}/pkgconfig/Qt5X11Extras.pc %{_qt5_archdatadir}/mkspecs/modules/qt_lib_x11extras*.pri +%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#1733158 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-2 - Rebuild to fix CET notes Resolves: bz#1657239