6.2.0 - beta4

.gitignore

@@ -4,3 +4,4 @@
 /qttools-everywhere-src-6.1.0.tar.xz
 /qttools-everywhere-src-6.1.1.tar.xz
 /qttools-everywhere-src-6.1.2.tar.xz
+/qttools-everywhere-src-6.2.0-beta4.tar.xz

qt6-qttools.spec

@@ -1,14 +1,29 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
 %global qt_module qttools
 
+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta4
+%endif
+
 Summary: Qt6 - QtTool components
 Name:    qt6-qttools
-Version: 6.1.2
+Version: 6.2.0%{?unstable:~%{prerelease}}
 Release: 1%{?dist}
 
 License: LGPLv3 or LGPLv2
 Url:     http://www.qt.io
 %global majmin %(echo %{version} | cut -d. -f1-2)
+%global  qt_version %(echo %{version} | cut -d~ -f1)
+
+%if 0%{unstable}
+Source0: https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/submodules/%{qt_module}-everywhere-src-%{qt_version}-%{prerelease}.tar.xz
+%else
 Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
+%endif
 
 # help lrelease/lupdate use/prefer qmake-qt6
 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893
@@ -136,7 +151,7 @@ Requires: %{name}-common = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-everywhere-src-%{version}
+%setup -q -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}}
 
 %patch1 -p1 -b .run-qttools-with-qt6-suffix
 %ifarch %{mips32}
@@ -178,8 +193,7 @@ for i in * ; do
   case "${i}" in
    assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool| \
    qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator| \
-   qtplugininfo|qtattributionsscanner|qtpaths| \
+   qtplugininfo|qdistancefieldgenerator|qdoc|qtdiag)
-   qdistancefieldgenerator|qdoc|qtdiag)
       ln -v  ${i} %{buildroot}%{_bindir}/${i}-qt6
       ln -sv ${i} ${i}-qt6
       ;;
@@ -220,11 +234,8 @@ popd
 
 %files
 %{_bindir}/qdbus-qt6
-%{_bindir}/qtpaths-qt6
 %{_qt6_bindir}/qdbus
 %{_qt6_bindir}/qdbus-qt6
-%{_qt6_bindir}/qtpaths
-%{_qt6_bindir}/qtpaths-qt6
 %{_qt6_libdir}/libQt6UiTools.so.6*
 
 %files common
@@ -260,8 +271,7 @@ popd
 %{_bindir}/qhelpgenerator*
 %{_qt6_bindir}/qdistancefieldgenerator*
 %{_qt6_bindir}/qhelpgenerator*
-%{_bindir}/qtattributionsscanner-qt6
+%{_qt6_libexecdir}/qtattributionsscanner*
-%{_qt6_bindir}/qtattributionsscanner*
 
 %files -n qt6-designer
 %{_bindir}/designer*
@@ -321,7 +331,7 @@ popd
 %{_qt6_libdir}/cmake/Qt6/FindWrapLibClang.cmake
 %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtToolsTestsConfig.cmake
 %{_qt6_libdir}/cmake/Qt6Designer/*.cmake
-%{_qt6_libdir}/cmake/Qt6DesignerComponents/*.cmake
+%{_qt6_libdir}/cmake/Qt6DesignerComponentsPrivate/*.cmake
 %dir %{_qt6_libdir}/cmake/Qt6Help/
 %{_qt6_libdir}/cmake/Qt6Help/*.cmake
 %dir %{_qt6_libdir}/cmake/Qt6Linguist
@@ -344,6 +354,7 @@ popd
 %{_qt6_archdatadir}/mkspecs/modules/qt_lib_linguist_private.pri
 %{_qt6_archdatadir}/mkspecs/modules/qt_lib_tools_private.pri
 %{_qt6_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri
+%{_qt6_libdir}/metatypes/qt6*_metatypes.json
 
 
 %files static
@@ -362,6 +373,9 @@ popd
 
 
 %changelog
+* Mon Sep 13 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
 * Thu Aug 12 2021 Jan Grulich <jgrulich@redhat.com> - 6.1.2-1
 - 6.1.2
 

sources

@@ -1 +1 @@
-SHA512 (qttools-everywhere-src-6.1.2.tar.xz) = 28476cab9da379fc3a01ec67a628f10d1af69f2161c9291cbef83e5376872bacb429d855b3217fa4a050f15b79bb8b12fce6944f8ab1dc2dbdf170815be51bc5
+SHA512 (qttools-everywhere-src-6.2.0-beta4.tar.xz) = 9f1b771a5907f9e9d84e749fe312262ee6e9fb91f9078a1634380bc01d0812cf0b795b46a4dbf9869ba5d3e391d29d9b98d73adea299c8d8604e0e160b509675