diff --git a/.gitignore b/.gitignore index e1d610a..566a19a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtxmlpatterns-everywhere-src-5.11.1.tar.xz +SOURCES/qtxmlpatterns-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qtxmlpatterns.metadata b/.qt5-qtxmlpatterns.metadata index a116545..43b7f37 100644 --- a/.qt5-qtxmlpatterns.metadata +++ b/.qt5-qtxmlpatterns.metadata @@ -1 +1 @@ -6840596d0164450291318fb27e302d450abdfc35 SOURCES/qtxmlpatterns-everywhere-src-5.11.1.tar.xz +944bb44e6e108d8acf5d4c6952a400d2ea3c7c93 SOURCES/qtxmlpatterns-everywhere-src-5.12.5.tar.xz diff --git a/SPECS/qt5-qtxmlpatterns.spec b/SPECS/qt5-qtxmlpatterns.spec index f198e0e..7eb0ffe 100644 --- a/SPECS/qt5-qtxmlpatterns.spec +++ b/SPECS/qt5-qtxmlpatterns.spec @@ -1,9 +1,11 @@ %global qt_module qtxmlpatterns +%global build_tests 1 + Summary: Qt5 - QtXmlPatterns 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 Url: http://www.qt.io @@ -14,6 +16,7 @@ BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-private-devel #libQt5Core.so.5(Qt_5_PRIVATE_API)(64bit) %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} +BuildRequires: qt5-qtdeclarative-devel %description The Qt XML Patterns module provides support for XPath, XQuery, XSLT, @@ -32,6 +35,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 %autosetup -n %{qt_module}-everywhere-src-%{version} -p1 @@ -40,12 +51,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 + # put non-conflicting binaries with -qt5 postfix in {_bindir} mkdir %{buildroot}%{_bindir} pushd %{buildroot}%{_qt5_bindir} @@ -75,12 +102,12 @@ done popd -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license LICENSE.LGPL* %{_qt5_libdir}/libQt5XmlPatterns.so.5* +%{_qt5_archdatadir}/qml/QtQuick/XmlListModel/ %files devel %{_qt5_bindir}/xmlpatterns* @@ -95,8 +122,16 @@ popd %files examples %{_qt5_examplesdir}/ +%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#1733157 + * Mon Dec 10 2018 Jan Grulich - 5.11.1-2 - Rebuild to fix CET notes Resolves: bz#1657227