Merge branch 'f35' into f34

This commit is contained in:
Jan Grulich 2022-03-06 20:08:32 +01:00
commit c6a127c3dc
3 changed files with 21 additions and 9 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@
/qtbase-everywhere-src-6.2.0.tar.xz
/qtbase-everywhere-src-6.2.1.tar.xz
/qtbase-everywhere-src-6.2.2.tar.xz
/qtbase-everywhere-src-6.2.3.tar.xz

View File

@ -1,6 +1,3 @@
# FIXME: qt6-qtdeclarative doesn't build on S390x
# BUG: https://bugreports.qt.io/browse/QTBUG-93101
ExcludeArch: s390x
# See http://bugzilla.redhat.com/223663
%global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9
@ -41,8 +38,8 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt6-qtbase
Summary: Qt6 - QtBase components
Version: 6.2.2
Release: 1%{?dist}
Version: 6.2.3
Release: 2%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -430,7 +427,7 @@ translationdir=%{_qt6_translationdir}
Name: Qt6
Description: Qt6 Configuration
Version: 6.2.2
Version: 6.2.3
EOF
# rpm macros
@ -563,11 +560,13 @@ make check -k ||:
%dir %{_qt6_datadir}/modules
%dir %{_qt6_libdir}/metatypes
%dir %{_qt6_libdir}/cmake/Qt6
%dir %{_qt6_libdir}/cmake/Qt6/config.tests/
%dir %{_qt6_libdir}/cmake/Qt6/platforms
%dir %{_qt6_libdir}/cmake/Qt6/platforms/Platform
%dir %{_qt6_libdir}/cmake/Qt6/config.tests
%dir %{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules
%dir %{_qt6_libdir}/cmake/Qt6/3rdparty/kwin
%dir %{_qt6_libdir}/cmake/Qt6BuildInternals
%dir %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/
%dir %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests
%dir %{_qt6_libdir}/cmake/Qt6Concurrent
%dir %{_qt6_libdir}/cmake/Qt6Core
%dir %{_qt6_libdir}/cmake/Qt6CoreTools
@ -835,6 +834,18 @@ make check -k ||:
%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
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jan 06 2022 Filip Januš <fjanus@redhat.com> - 6.2.2-2
- Rebuild for Postgresql 14
* Tue Dec 14 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.2-1
- 6.2.2

View File

@ -1 +1 @@
SHA512 (qtbase-everywhere-src-6.2.2.tar.xz) = 769dbf2b271083cfb9c72e6bd99cd52cdfd7d9d303d88d05175e4f0da5e8da5df9724bd48ad664e1d8e829a3529fa166654138c48cb36636f4787d0b26ff4b3b
SHA512 (qtbase-everywhere-src-6.2.3.tar.xz) = c1adfb971723213f193223de222e10414868cf091e79c1fedbcaaa495cce57976bb65ac5d20138bc7e5668b92bf88ef054783b55c59b3a8feffc837596764698