From 2bcab5d859e8be09df9fa3cc8a376582a54905ba Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Thu, 6 Jan 2022 22:45:44 +0100 Subject: [PATCH 1/4] Rebuild for Postgresql 14 --- qt6-qtbase.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 437d82e..74b7bd6 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -42,7 +42,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.2.2 -Release: 1%{?dist} +Release: 2%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -834,6 +834,9 @@ make check -k ||: %changelog +* Thu Jan 06 2022 Filip Januš - 6.2.2-2 +- Rebuild for Postgresql 14 + * Tue Dec 14 2021 Jan Grulich - 6.2.2-1 - 6.2.2 From 31e93736c135913b9522e57b70cd1678bfce8587 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 17:12:41 +0000 Subject: [PATCH 2/4] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt6-qtbase.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 74b7bd6..e9787f2 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -42,7 +42,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.2.2 -Release: 2%{?dist} +Release: 3%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -834,6 +834,9 @@ make check -k ||: %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jan 06 2022 Filip Januš - 6.2.2-2 - Rebuild for Postgresql 14 From c3b5325d5ca4cde31eea727d9ee65b1b4ec4d1a4 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 31 Jan 2022 14:42:26 +0100 Subject: [PATCH 3/4] 6.2.3 --- .gitignore | 1 + qt6-qtbase.spec | 15 ++++++++++----- sources | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 31d56b0..30c57eb 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index e9787f2..ac24cfe 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -41,8 +41,8 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components -Version: 6.2.2 -Release: 3%{?dist} +Version: 6.2.3 +Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -429,7 +429,7 @@ translationdir=%{_qt6_translationdir} Name: Qt6 Description: Qt6 Configuration -Version: 6.2.2 +Version: 6.2.3 EOF # rpm macros @@ -562,11 +562,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 @@ -834,6 +836,9 @@ make check -k ||: %changelog +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + * Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 5f71dbd..1b0eb63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtbase-everywhere-src-6.2.2.tar.xz) = 769dbf2b271083cfb9c72e6bd99cd52cdfd7d9d303d88d05175e4f0da5e8da5df9724bd48ad664e1d8e829a3529fa166654138c48cb36636f4787d0b26ff4b3b +SHA512 (qtbase-everywhere-src-6.2.3.tar.xz) = c1adfb971723213f193223de222e10414868cf091e79c1fedbcaaa495cce57976bb65ac5d20138bc7e5668b92bf88ef054783b55c59b3a8feffc837596764698 From 87e7cd2e38128dafddd1267c88f5951e3f4c3fe6 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 25 Feb 2022 12:45:49 +0100 Subject: [PATCH 4/4] Enable s390x builds --- qt6-qtbase.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index ac24cfe..ab7efae 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -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 @@ -42,7 +39,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.2.3 -Release: 1%{?dist} +Release: 2%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -836,6 +833,9 @@ make check -k ||: %changelog +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + * Mon Jan 31 2022 Jan Grulich - 6.2.3-1 - 6.2.3