diff --git a/.gitignore b/.gitignore index 430bd38..d7d02d0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /qt5compat-everywhere-src-6.1.0.tar.xz /qt5compat-everywhere-src-6.1.1.tar.xz /qt5compat-everywhere-src-6.1.2.tar.xz +/qt5compat-everywhere-src-6.2.0-beta4.tar.xz diff --git a/qt6-qt5compat.spec b/qt6-qt5compat.spec index bee7c1c..a99cc7b 100644 --- a/qt6-qt5compat.spec +++ b/qt6-qt5compat.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 qt5compat +%global unstable 1 +%if 0%{unstable} +%global prerelease beta4 +%endif + Summary: Qt6 - Qt 5 Compatibility Libraries Name: qt6-%{qt_module} -Version: 6.1.2 +Version: 6.2.0%{?unstable:~%{prerelease}} Release: 1%{?dist} License: LGPLv3 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 # Upstream patches @@ -34,7 +49,7 @@ Requires: qt6-qtbase-devel%{?_isa} %prep -%autosetup -n %{qt_module}-everywhere-src-%{version} -p1 +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 %build @@ -76,8 +91,12 @@ popd %{_qt6_libdir}/cmake/Qt6Core5Compat/*.cmake %{_qt6_archdatadir}/mkspecs/modules/*.pri %{_qt6_datadir}/modules/*.json +%{_qt6_libdir}/metatypes/qt6*_metatypes.json %changelog +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 +- 6.2.0 - beta4 + * Thu Aug 12 2021 Jan Grulich - 6.1.2-1 - 6.1.2 diff --git a/sources b/sources index 3d890d7..1048a3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qt5compat-everywhere-src-6.1.2.tar.xz) = 643c7ae1c9e9e60becfd083fb1d88a3dde58bdf2bd5706ff4832a76f416f0bfae197e7a22198a61df7a966f99a55a030dc30fa3abd6814fae1df2077f5329da9 +SHA512 (qt5compat-everywhere-src-6.2.0-beta4.tar.xz) = c00a53a888fdf9803181c084beef2c1a8ff0bf9a4079b34e65e9d59f825124818ed439438091ca13a07468080e95e9a38964f579923f72232fecec81c6096d47