From 71cb869f4a6b576f3145795f2a420f503c7e258e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Apr 2020 11:39:38 -0400 Subject: [PATCH] import qt5-qtimageformats-5.12.5-1.el8 --- .gitignore | 2 +- .qt5-qtimageformats.metadata | 2 +- SPECS/qt5-qtimageformats.spec | 43 +++++++++++++++++++++++++++++++---- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ab65cfa..b41ff62 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtimageformats-everywhere-src-5.11.1.tar.xz +SOURCES/qtimageformats-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qtimageformats.metadata b/.qt5-qtimageformats.metadata index bc5390f..c79866e 100644 --- a/.qt5-qtimageformats.metadata +++ b/.qt5-qtimageformats.metadata @@ -1 +1 @@ -6782ae5772b703e33d6fa1e4e051a6bcb07f4690 SOURCES/qtimageformats-everywhere-src-5.11.1.tar.xz +a42b1a3346749e97f46fdcfb6dc6e51337099bf2 SOURCES/qtimageformats-everywhere-src-5.12.5.tar.xz diff --git a/SPECS/qt5-qtimageformats.spec b/SPECS/qt5-qtimageformats.spec index a4bd49e..752b1e6 100644 --- a/SPECS/qt5-qtimageformats.spec +++ b/SPECS/qt5-qtimageformats.spec @@ -1,9 +1,11 @@ %global qt_module qtimageformats +%global build_tests 1 + Summary: Qt5 - QtImageFormats 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 details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -40,6 +42,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} @@ -50,15 +60,31 @@ rm -rv src/3rdparty %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 + %files -%license LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL* +%license LICENSE.GPL* LICENSE.LGPL* %{_qt5_plugindir}/imageformats/libqmng.so %{_qt5_plugindir}/imageformats/libqtga.so %{_qt5_plugindir}/imageformats/libqtiff.so @@ -68,8 +94,17 @@ make install INSTALL_ROOT=%{buildroot} %{_qt5_plugindir}/imageformats/libqwebp.so %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_*Plugin.cmake +%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#1733142 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-2 - Rebuild to fix CET notes Resolves: bz#1657234