diff --git a/.gitignore b/.gitignore index 4f11f02..3402482 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /qtdeclarative-everywhere-src-6.2.1.tar.xz /qtdeclarative-everywhere-src-6.2.2.tar.xz /qtdeclarative-everywhere-src-6.2.3.tar.xz +/qtdeclarative-everywhere-src-6.3.0.tar.xz diff --git a/qt6-qtdeclarative.spec b/qt6-qtdeclarative.spec index 63eb442..7c2fd1a 100644 --- a/qt6-qtdeclarative.spec +++ b/qt6-qtdeclarative.spec @@ -9,10 +9,12 @@ %global prerelease rc2 %endif +#global examples 1 + Summary: Qt6 - QtDeclarative component Name: qt6-%{qt_module} -Version: 6.2.3 -Release: 2%{?dist} +Version: 6.3.0 +Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -77,6 +79,7 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description static %{summary}. +%if 0%{?examples} %package examples Summary: Programming examples for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -84,7 +87,7 @@ Obsoletes: qt6-qtquickcontrols2-examples < 6.2.0~beta3-1 Provides: qt6-qtquickcontrols2-examples = %{version}-%{release} %description examples %{summary}. - +%endif %prep %autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 @@ -96,7 +99,7 @@ Provides: qt6-qtquickcontrols2-examples = %{version}-%{release} ln -s %{__python3} python export PATH=`pwd`:$PATH -%cmake_qt6 +%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=FALSE %cmake_build @@ -191,7 +194,7 @@ make check -k -C tests ||: %dir %{_qt6_libdir}/cmake/Qt6QmlCompilerPrivate/ %dir %{_qt6_libdir}/cmake/Qt6QmlCore %dir %{_qt6_libdir}/cmake/Qt6QmlDebugPrivate/ -%dir %{_qt6_libdir}/cmake/Qt6QmlDevToolsPrivate/ +%dir %{_qt6_libdir}/cmake/Qt6QmlIntegration/ %dir %{_qt6_libdir}/cmake/Qt6QmlImportScanner/ %dir %{_qt6_libdir}/cmake/Qt6LabsAnimation %dir %{_qt6_libdir}/cmake/Qt6LabsFolderListModel @@ -199,6 +202,7 @@ make check -k -C tests ||: %dir %{_qt6_libdir}/cmake/Qt6LabsSettings %dir %{_qt6_libdir}/cmake/Qt6LabsSharedImage %dir %{_qt6_libdir}/cmake/Qt6LabsWavefrontMesh +%dir %{_qt6_libdir}/cmake/Qt6QmlLintPrivate/ %dir %{_qt6_libdir}/cmake/Qt6QmlDomPrivate %dir %{_qt6_libdir}/cmake/Qt6QmlLocalStorage %dir %{_qt6_libdir}/cmake/Qt6QmlModels/ @@ -248,7 +252,7 @@ make check -k -C tests ||: %{_qt6_libdir}/cmake/Qt6QmlCompilerPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6QmlCore/*.cmake %{_qt6_libdir}/cmake/Qt6QmlDebugPrivate/*.cmake -%{_qt6_libdir}/cmake/Qt6QmlDevToolsPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlIntegration/*.cmake %{_qt6_libdir}/cmake/Qt6QmlImportScanner/*.cmake %{_qt6_libdir}/cmake/Qt6LabsAnimation/*.cmake %{_qt6_libdir}/cmake/Qt6LabsFolderListModel/*.cmake @@ -258,6 +262,7 @@ make check -k -C tests ||: %{_qt6_libdir}/cmake/Qt6LabsWavefrontMesh/*.cmake %{_qt6_libdir}/cmake/Qt6QmlDomPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6QmlLocalStorage/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlLintPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6QmlModels/*.cmake %{_qt6_libdir}/cmake/Qt6QmlTools/*.cmake %{_qt6_libdir}/cmake/Qt6QmlWorkerScript/*.cmake @@ -289,14 +294,14 @@ make check -k -C tests ||: %{_qt6_libdir}/libQt6QmlDom.a %{_qt6_libdir}/libQt6QmlDom.prl %{_qt6_libdir}/libQt6QmlLocalStorage.prl +%{_qt6_libdir}/libQt6QmlLint.a +%{_qt6_libdir}/libQt6QmlLint.prl %{_qt6_libdir}/libQt6Quick*.prl %{_qt6_libdir}/libQt6QmlWorkerScript.prl %{_qt6_libdir}/libQt6QmlModels.prl %{_qt6_libdir}/libQt6Qml.prl %{_qt6_libdir}/libQt6QmlCompiler.a %{_qt6_libdir}/libQt6QmlCompiler.prl -%{_qt6_libdir}/libQt6QmlDevTools.prl -%{_qt6_libdir}/libQt6QmlDevTools.a %{_qt6_libdir}/libQt6PacketProtocol.a %{_qt6_libdir}/libQt6PacketProtocol.prl %{_qt6_libdir}/libQt6QuickControlsTestUtils.a @@ -305,11 +310,15 @@ make check -k -C tests ||: %{_qt6_libdir}/libQt6QmlDebug.prl %{_qt6_libdir}/libQt6QmlXmlListModel.prl +%if 0%{?examples} %files examples %{_qt6_examplesdir}/ - +%endif %changelog +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + * Fri Feb 25 2022 Jan Grulich - 6.2.3-2 - Enable s390x builds diff --git a/sources b/sources index f7c59fc..3d00968 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtdeclarative-everywhere-src-6.2.3.tar.xz) = 27433c6c0247cfc03bf3f1fe74a6d842c627d8259104723100eaec5bfa82026565de1206383fe50ae041f858286f6fb3b96204c1eaca21cb28fa6786bded5dd4 +SHA512 (qtdeclarative-everywhere-src-6.3.0.tar.xz) = 91518a8a528f4698d47d2789a9e4150fbd7661cc13d1040521905013e590ff432b3d4db1e1e08f3a3d2d212709ea2ad82cad5730f8ce9f6503776f1435e2980c