Merge branch 'f36' into f35

2022-03-06 19:52:49 +01:00 · 2022-03-06 19:52:49 +01:00 · 51433c58ad
parent 1b966afffc 0a9a59f198
commit 51433c58ad
1 changed files with 4 additions and 4 deletions
--- a/qt6-qttools.spec
+++ b/qt6-qttools.spec
@ -1,6 +1,3 @@
-# FIXME: qt6-qtdeclarative doesn't build on S390x
-# BUG: https://bugreports.qt.io/browse/QTBUG-93101
-ExcludeArch: s390x

 %global qt_module qttools

@ -12,7 +9,7 @@ ExcludeArch: s390x
 Summary: Qt6 - QtTool components
 Name:    qt6-qttools
 Version: 6.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}

 License: LGPLv3 or LGPLv2
 Url:     http://www.qt.io
@ -373,6 +370,9 @@ popd


 %changelog
+* Fri Feb 25 2022 Jan Grulich <jgrulich@redhat.com> - 6.2.3-2
+- Enable s390x builds
+
 * Mon Jan 31 2022 Jan Grulich <jgrulich@redhat.com> - 6.2.3-1
 - 6.2.3