diff --git a/.gitignore b/.gitignore index 2e5464b..9ba394a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtsvg-everywhere-src-5.11.1.tar.xz +SOURCES/qtsvg-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qtsvg.metadata b/.qt5-qtsvg.metadata index 216093b..657440c 100644 --- a/.qt5-qtsvg.metadata +++ b/.qt5-qtsvg.metadata @@ -1 +1 @@ -254081ba46e914515601a9934a85ceb50d7afe04 SOURCES/qtsvg-everywhere-src-5.11.1.tar.xz +184fdb57865e3a42da4f3afc7bb17f9423663d15 SOURCES/qtsvg-everywhere-src-5.12.5.tar.xz diff --git a/SOURCES/qtsvg-opensource-src-5.6.0-beta1-example-install.patch b/SOURCES/qtsvg-opensource-src-5.6.0-beta1-example-install.patch deleted file mode 100644 index d2eb649..0000000 --- a/SOURCES/qtsvg-opensource-src-5.6.0-beta1-example-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/examples/svg/richtext/textobject/textobject.pro b/examples/svg/richtext/textobject/textobject.pro -index 8892ae7..f9ec7c6 100644 ---- a/examples/svg/richtext/textobject/textobject.pro -+++ b/examples/svg/richtext/textobject/textobject.pro -@@ -14,6 +14,6 @@ INSTALLS += target - - wince*{ - filesToDeploy.files = files/*.svg -- filesToDeploy.path = files -+ filesToDeploy.path = $$[QT_INSTALL_EXAMPLES]/svg/richtext/textobject/files - DEPLOYMENT += filesToDeploy - } diff --git a/SPECS/qt5-qtsvg.spec b/SPECS/qt5-qtsvg.spec index 15e88ad..0e9e6f9 100644 --- a/SPECS/qt5-qtsvg.spec +++ b/SPECS/qt5-qtsvg.spec @@ -1,9 +1,11 @@ %global qt_module qtsvg +%global build_tests 1 + Summary: Qt5 - Support for rendering and displaying SVG 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 @@ -11,7 +13,6 @@ 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 -Patch0: qtsvg-opensource-src-5.6.0-beta1-example-install.patch BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: pkgconfig(zlib) @@ -37,6 +38,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 %autosetup -n %{qt_module}-everywhere-src-%{version} -p1 @@ -47,10 +57,28 @@ 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 + + ## .prl/.la file love # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs pushd %{buildroot}%{_qt5_libdir} @@ -85,8 +113,17 @@ 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#1733151 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-2 - Rebuild to fix CET notes Resolves: bz#1657241