Architecture specific change in rpms/qt6-qttools.git - Arch-excludes - Fedora mailing-lists

4 Oct 2021

The package rpms/qt6-qttools.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/qt6-qttools.git/commit/?id=4b5ab668c....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit efeeb83772f14b41cd1d8dfccf9f6f62b03b00ab
Merge: 7debbe2 f57c90f
Author: Jan Grulich jgrulich@redhat.com
Date:   Mon Oct 4 10:15:10 2021 +0200
Merge branch 'f35' into f34
commit f57c90f571780638b8523dc501b46d4dfda9dce9
Author: Jan Grulich jgrulich@redhat.com
Date:   Thu Sep 30 13:38:45 2021 +0200
6.2.0

diff --git a/.gitignore b/.gitignore
index ea91332..d0c3eeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /qttools-everywhere-src-6.2.0-beta4.tar.xz
 /qttools-everywhere-src-6.2.0-rc.tar.xz
 /qttools-everywhere-src-6.2.0-rc2.tar.xz
+/qttools-everywhere-src-6.2.0.tar.xz
diff --git a/qt6-qttools.spec b/qt6-qttools.spec
index e055813..eabc87a 100644
--- a/qt6-qttools.spec
+++ b/qt6-qttools.spec
@@ -4,8 +4,8 @@ ExcludeArch: s390x
%global qt_module qttools
-%global unstable 1
-%if 0%{unstable}
+#global unstable 1
+%if 0%{?unstable}
 %global prerelease rc2
 %endif
@@ -19,7 +19,7 @@ Url:     http://www.qt.io
 %global majmin %(echo %{version} | cut -d. -f1-2)
 %global  qt_version %(echo %{version} | cut -d~ -f1)
-%if 0%{unstable}
+%if 0%{?unstable}
 Source0: https://download.qt.io/development_releases/qt/%%7Bmajmin%7D/%%7Bqt_version%...
 %else
 Source0: https://download.qt.io/official_releases/qt/%%7Bmajmin%7D/%%7Bversion%7D/sub...
@@ -373,6 +373,9 @@ popd
%changelog
+* Thu Sep 30 2021 Jan Grulich jgrulich@redhat.com - 6.2.0-1
+- 6.2.0
+
 * Mon Sep 27 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~rc2-1
 - 6.2.0 - rc2
diff --git a/sources b/sources
index 606dc84..4d8d065 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qttools-everywhere-src-6.2.0-rc2.tar.xz) = c788c8a8b0b8ccc9002baffad38320ded2aaec8591e9f914070dd9e7e103e3854efdb6e6866de4d2265e1f55ef7145c3c748be4dcd5901fb0105030929fff422
+SHA512 (qttools-everywhere-src-6.2.0.tar.xz) = 93998976db391ddd955ebd0fc368826b2419966c1369e466ec91aba27057063770e88e6fb6df22b8d4ca52b7789dea5e709e2c863411c177fbc044ae566b24c6
commit 232a3e26e89c4899a6f757117b1e47f967163fc7
Author: Jan Grulich jgrulich@redhat.com
Date:   Mon Sep 27 14:14:34 2021 +0200
6.2.0 - rc2
diff --git a/.gitignore b/.gitignore
index 556b4ce..ea91332 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /qttools-everywhere-src-6.1.2.tar.xz
 /qttools-everywhere-src-6.2.0-beta4.tar.xz
 /qttools-everywhere-src-6.2.0-rc.tar.xz
+/qttools-everywhere-src-6.2.0-rc2.tar.xz
diff --git a/qt6-qttools.spec b/qt6-qttools.spec
index 2b84c18..e055813 100644
--- a/qt6-qttools.spec
+++ b/qt6-qttools.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
 %if 0%{unstable}
-%global prerelease rc
+%global prerelease rc2
 %endif
Summary: Qt6 - QtTool components
@@ -373,6 +373,9 @@ popd
%changelog
+* Mon Sep 27 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~rc2-1
+- 6.2.0 - rc2
+
 * Sat Sep 18 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~rc-1
 - 6.2.0 - rc
diff --git a/sources b/sources
index 4d1bcb5..606dc84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qttools-everywhere-src-6.2.0-rc.tar.xz) = 925484909060dc3d25a91500ad34abecf6f587b4ba503c1378c26e56f3d75ec5d1513087c1e5696e27354914599b690664d927372e80db3618e4532bc8907bb6
+SHA512 (qttools-everywhere-src-6.2.0-rc2.tar.xz) = c788c8a8b0b8ccc9002baffad38320ded2aaec8591e9f914070dd9e7e103e3854efdb6e6866de4d2265e1f55ef7145c3c748be4dcd5901fb0105030929fff422
commit 5dfe4fcbefc39658d9f26c846c16b0fe5329e659
Author: Jan Grulich jgrulich@redhat.com
Date:   Sun Sep 19 13:28:55 2021 +0200
6.2.0 - rc
diff --git a/.gitignore b/.gitignore
index b8596ec..556b4ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /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
+/qttools-everywhere-src-6.2.0-rc.tar.xz
diff --git a/qt6-qttools.spec b/qt6-qttools.spec
index 4873091..2b84c18 100644
--- a/qt6-qttools.spec
+++ b/qt6-qttools.spec
@@ -6,7 +6,7 @@ ExcludeArch: s390x
%global unstable 1
 %if 0%{unstable}
-%global prerelease beta4
+%global prerelease rc
 %endif
Summary: Qt6 - QtTool components
@@ -373,6 +373,9 @@ popd
%changelog
+* Sat Sep 18 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~rc-1
+- 6.2.0 - rc
+
 * Mon Sep 13 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~beta4-1
 - 6.2.0 - beta4
diff --git a/sources b/sources
index b862528..4d1bcb5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qttools-everywhere-src-6.2.0-beta4.tar.xz) = 9f1b771a5907f9e9d84e749fe312262ee6e9fb91f9078a1634380bc01d0812cf0b795b46a4dbf9869ba5d3e391d29d9b98d73adea299c8d8604e0e160b509675
+SHA512 (qttools-everywhere-src-6.2.0-rc.tar.xz) = 925484909060dc3d25a91500ad34abecf6f587b4ba503c1378c26e56f3d75ec5d1513087c1e5696e27354914599b690664d927372e80db3618e4532bc8907bb6
commit 4b5ab668c11d3be6c22238f892175359c0b61a35
Author: Jan Grulich jgrulich@redhat.com
Date:   Mon Sep 13 15:53:34 2021 +0200
6.2.0 - beta4
diff --git a/.gitignore b/.gitignore
index e06b0fc..b8596ec 100644
--- a/.gitignore
+++ b/.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
diff --git a/qt6-qttools.spec b/qt6-qttools.spec
index 3927b88..4873091 100644
--- a/qt6-qttools.spec
+++ b/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/%%7Bmajmin%7D/%%7Bqt_version%...
+%else
 Source0: https://download.qt.io/official_releases/qt/%%7Bmajmin%7D/%%7Bversion%7D/sub...
+%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| \
-   qdistancefieldgenerator|qdoc|qtdiag)
+   qtplugininfo|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_bindir}/qtattributionsscanner*
+%{_qt6_libexecdir}/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
diff --git a/sources b/sources
index 44f69af..b862528 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qttools-everywhere-src-6.1.2.tar.xz) = 28476cab9da379fc3a01ec67a628f10d1af69f2161c9291cbef83e5376872bacb429d855b3217fa4a050f15b79bb8b12fce6944f8ab1dc2dbdf170815be51bc5
+SHA512 (qttools-everywhere-src-6.2.0-beta4.tar.xz) = 9f1b771a5907f9e9d84e749fe312262ee6e9fb91f9078a1634380bc01d0812cf0b795b46a4dbf9869ba5d3e391d29d9b98d73adea299c8d8604e0e160b509675

    