X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=qt5-qtbase.spec;h=c584b78eea31313540324a3251dacb0008f9d930;hb=dae41078edc7852ae619d29dca5739e38d8f17f0;hp=6d9df4899220db191f922ad381f3c9476e420136;hpb=c83e7463c5564fbd2a959e3a8a392e14fec395b7;p=packages%2Fqt5-qtbase.git

diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 6d9df48..c584b78 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -8,15 +8,18 @@
 %bcond_with	static_libs	# static libraries [incomplete support in .spec]
 %bcond_with	bootstrap	# disable features to able to build without installed qt5
 # -- build targets
+%bcond_without	doc		# Documentation
 %bcond_without	qm		# QM translations
 # -- features
 %bcond_without	cups		# CUPS printing support
 %bcond_without	directfb	# DirectFB platform support
 %bcond_without	egl		# EGL (EGLFS, minimal EGL) platform support
 %bcond_without	gtk		# GTK+ theme integration
+%bcond_without	kerberos5	# KRB5 GSSAPI Support
 %bcond_without	kms		# KMS platform support
 %bcond_without	libinput	# libinput support
 %bcond_without	pch		# pch (pre-compiled headers) in qmake
+%bcond_without	statx		# build without statx()
 %bcond_with	systemd		# logging to journald
 %bcond_without	tslib		# tslib support
 # -- databases
@@ -50,47 +53,54 @@
 %ifarch pentium4 %{x8664} x32
 %define		with_sse2	1
 %endif
+# QTBUG-36129
+%ifnarch %{arm} aarch64
+%define		with_red_reloc	1
+%endif
 
 %if %{with bootstrap}
+%undefine	with_doc
 %undefine	with_qm
 %endif
 
-%define		icu_abi		59
+%define		icu_abi		69
 %define		next_icu_abi	%(echo $((%{icu_abi} + 1)))
 
 %define		orgname		qtbase
 Summary:	Qt5 - base components
 Summary(pl.UTF-8):	Biblioteka Qt5 - podstawowe komponenty
 Name:		qt5-%{orgname}
-Version:	5.11.1
-Release:	5
-# See LGPL_EXCEPTION.txt for exception details
-License:	LGPL v2 with Digia Qt LGPL Exception v1.1 or GPL v3
+Version:	5.15.2
+Release:	7
+License:	LGPL v3 or GPL v2 or GPL v3 or commercial
 Group:		X11/Libraries
-Source0:	http://download.qt.io/official_releases/qt/5.11/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
-# Source0-md5:	c656471f138d3810187a523293e2cc28
-Source1:	http://download.qt.io/official_releases/qt/5.11/%{version}/submodules/qttranslations-everywhere-src-%{version}.tar.xz
-# Source1-md5:	67c0dbd61c2b92552b5339d82a94b1a8
+Source0:	https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
+# Source0-md5:	0eb522ff6c2194f9690cbdcd5b33e803
+Source1:	https://download.qt.io/official_releases/qt/5.15/%{version}/submodules/qttranslations-everywhere-src-%{version}.tar.xz
+# Source1-md5:	9b66cdb64402e8fd9e843f8a7120abb1
 Patch0:		%{name}-system_cacerts.patch
-Patch1:		qt5-qtbase-glibc.patch
-URL:		http://www.qt.io/
+Patch1:		gcc11.patch
+URL:		https://www.qt.io/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	EGL-devel
 %{?with_ibase:BuildRequires:	Firebird-devel}
 %{?with_kms:BuildRequires:	Mesa-libgbm-devel}
 BuildRequires:	OpenGL-devel
 %{?with_kms:BuildRequires:	OpenGLESv2-devel}
-BuildRequires:	alsa-lib-devel
-%{?with_gtk:BuildRequires:	atk-devel}
+BuildRequires:	Vulkan-Loader-devel
+BuildRequires:	at-spi2-core-devel
 %{?with_cups:BuildRequires:	cups-devel >= 1.4}
 BuildRequires:	dbus-devel >= 1.2
+BuildRequires:	double-conversion-devel
 BuildRequires:	fontconfig-devel
 %{?with_freetds:BuildRequires:	freetds-devel}
-BuildRequires:	freetype-devel >= 2.1.3
+BuildRequires:	freetype-devel >= 2.2.0
 %{?with_pch:BuildRequires:	gcc >= 5:4.0}
 BuildRequires:	gdb
 BuildRequires:	glib2-devel >= 2.0.0
-%{?with_gtk:BuildRequires:	gtk+2-devel >= 2:2.18}
+%{?with_gtk:BuildRequires:	gtk+3-devel >= 3.6}
+BuildRequires:	harfbuzz-devel >= 1.6.0
+%{?with_kerberos5:BuildRequires:	heimdal-devel}
 %{?with_kms:BuildRequires:	libdrm-devel}
 # see dependency on libicu version below
 BuildRequires:	libicu-devel < %{next_icu_abi}
@@ -98,18 +108,19 @@ BuildRequires:	libicu-devel >= %{icu_abi}
 %{?with_libinput:BuildRequires:	libinput-devel}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 2:1.0.8
-BuildRequires:	libstdc++-devel
-BuildRequires:	libxcb-devel >= 1.10
+BuildRequires:	libstdc++-devel >= 6:4.7
+BuildRequires:	libxcb-devel >= 1.12
+BuildRequires:	mtdev-devel
 %{?with_mysql:BuildRequires:	mysql-devel}
-BuildRequires:	openssl-devel
+BuildRequires:	openssl-devel >= 1.1.1
 %{?with_oci:BuildRequires:	oracle-instantclient-devel}
-BuildRequires:	pcre2-16-devel
+BuildRequires:	pcre2-16-devel >= 10.20
 BuildRequires:	pkgconfig
 %{?with_pgsql:BuildRequires:	postgresql-backend-devel}
 %{?with_pgsql:BuildRequires:	postgresql-devel}
-BuildRequires:	pulseaudio-devel >= 0.9.10
 %{?with_qm:BuildRequires:	qt5-linguist >= 5.2}
-BuildRequires:	rpmbuild(macros) >= 1.654
+%{?with_doc:BuildRequires:	qt5-assistant >= 5.9}
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	sed >= 4.0
 %{?with_sqlite2:BuildRequires:	sqlite-devel}
 %{?with_sqlite3:BuildRequires:	sqlite3-devel}
@@ -118,10 +129,12 @@ BuildRequires:	tar >= 1:1.22
 %{?with_tslib:BuildRequires:	tslib-devel}
 BuildRequires:	udev-devel
 %{?with_odbc:BuildRequires:	unixODBC-devel >= 2.3.0}
-BuildRequires:	xcb-util-image-devel
-BuildRequires:	xcb-util-keysyms-devel
-BuildRequires:	xcb-util-renderutil-devel
-BuildRequires:	xcb-util-wm-devel
+BuildRequires:	wayland-devel
+BuildRequires:	xcb-util-image-devel >= 0.3.9
+BuildRequires:	xcb-util-keysyms-devel >= 0.3.9
+BuildRequires:	xcb-util-renderutil-devel >= 0.3.9
+BuildRequires:	xcb-util-wm-devel >= 0.3.9
+BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXcursor-devel
@@ -130,14 +143,16 @@ BuildRequires:	xorg-lib-libXfixes-devel
 BuildRequires:	xorg-lib-libXi-devel
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXrandr-devel
-BuildRequires:	xorg-lib-libXrender-devel
-BuildRequires:	xorg-lib-libxkbcommon-devel >= 0.4.1
-BuildRequires:	xorg-lib-libxkbcommon-x11-devel >= 0.4.1
+BuildRequires:	xorg-lib-libXrender-devel >= 0.6
+BuildRequires:	xorg-lib-libxkbcommon-devel >= 0.5.0
+BuildRequires:	xorg-lib-libxkbcommon-x11-devel >= 0.5.0
 BuildRequires:	xz
-BuildRequires:	zlib-devel
+BuildRequires:	zlib-devel >= 1.0.8
+BuildRequires:	zstd-devel >= 1.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fno-strict-aliasing
+%define		filterout	-flto
 
 %define		qt5dir		%{_libdir}/qt5
 
@@ -158,7 +173,7 @@ Summary(pl.UTF-8):	Biblioteka Qt5 AccessibilitySupport - pliki programistyczne
 Group:		Development/Libraries
 # for (subset of) Qt5Core headers
 Requires:	Qt5Core-devel = %{version}-%{release}
-Requires:	zlib-devel
+Requires:	zlib-devel >= 1.0.8
 
 %description -n Qt5AccessibilitySupport-devel
 Qt5 AccessibilitySupport library - development files.
@@ -172,7 +187,7 @@ Summary(pl.UTF-8):	Biblioteka Qt5 Bootstrap - pliki programistyczne
 Group:		Development/Libraries
 # for (subset of) Qt5Core headers
 Requires:	Qt5Core-devel = %{version}-%{release}
-Requires:	zlib-devel
+Requires:	zlib-devel >= 1.0.8
 
 %description -n Qt5Bootstrap-devel
 Qt5 Bootstrap library (minimal part of Qt5 Core) - development files.
@@ -214,8 +229,10 @@ Pliki nagłówkowe biblioteki Qt5 Concurrent.
 Summary:	Qt5 Core library
 Summary(pl.UTF-8):	Biblioteka Qt5 Core
 Group:		Libraries
-Requires:	pcre16 >= 8.30
-Obsoletes:	qt5-qtbase
+Requires:	pcre2-16 >= 10.20
+Requires:	zlib >= 1.0.8
+Requires:	zstd >= 1.3
+Obsoletes:	qt5-qtbase < 5.2.0-1
 
 %description -n Qt5Core
 Qt5 Core library provides core non-GUI functionality.
@@ -229,11 +246,12 @@ Summary:	Qt5 Core library - development files
 Summary(pl.UTF-8):	Biblioteka Qt5 Core - pliki programistyczne
 Group:		Development/Libraries
 Requires:	Qt5Core = %{version}-%{release}
-Requires:	glib2-devel >= 2.0
 Requires:	libicu-devel
-Requires:	pcre16-devel >= 8.30
-Requires:	zlib-devel
-Obsoletes:	qt5-qtbase-devel
+Requires:	libstdc++-devel >= 6:4.7
+Requires:	pcre2-16-devel >= 10.20
+Requires:	qt5-qmake = %{version}-%{release}
+Requires:	zlib-devel >= 1.0.8
+Obsoletes:	qt5-qtbase-devel < 5.2.0-1
 
 %description -n Qt5Core-devel
 Header files for Qt5 Core library.
@@ -291,10 +309,10 @@ Group:		Development/Libraries
 Requires:	Qt5Core-devel = %{version}-%{release}
 
 %description -n Qt5EdidSupport-devel
-Qt5 EglSupport library - development files.
+Qt5 EdidSupport library - development files.
 
 %description -n Qt5EdidSupport-devel -l pl.UTF-8
-Biblioteka Qt5 EglSupport - pliki programistyczne.
+Biblioteka Qt5 EdidSupport - pliki programistyczne.
 
 %package -n Qt5EglSupport-devel
 Summary:	Qt5 EglSupport library - development files
@@ -315,6 +333,7 @@ Summary(pl.UTF-8):	Biblioteka Qt5 EventDispatcherSupport - pliki programistyczne
 Group:		Development/Libraries
 # for (subset of) Qt5Core headers
 Requires:	Qt5Core-devel = %{version}-%{release}
+Requires:	glib2-devel >= 2.0
 
 %description -n Qt5EventDispatcherSupport-devel
 Qt5 EventDispatcherSupport library - development files.
@@ -370,6 +389,7 @@ Requires:	Qt5Core = %{version}-%{release}
 Requires:	Qt5DBus = %{version}-%{release}
 # for compose platforminputcontext plugin
 Requires:	xorg-lib-libxkbcommon >= 0.4.1
+Suggests:	Qt5Gui-platform-xcb
 
 %description -n Qt5Gui
 The Qt5 GUI library provides the basic enablers for graphical
@@ -597,6 +617,7 @@ Summary:	Qt5 Gui platform theme plugin for GTK+ 3.x
 Summary(pl.UTF-8):	Wtyczka motywów platform Qt5 Gui dla GTK+ 3.x
 Group:		Libraries
 Requires:	Qt5Gui = %{version}-%{release}
+Obsoletes:	Qt5Gui-platformtheme-gtk2 < 5.8
 
 %description -n Qt5Gui-platformtheme-gtk3
 Qt5 Gui platform theme plugin for GTK+ 3.x.
@@ -604,17 +625,19 @@ Qt5 Gui platform theme plugin for GTK+ 3.x.
 %description -n Qt5Gui-platformtheme-gtk3 -l pl.UTF-8
 Wtyczka motywów platform Qt5 Gui dla GTK+ 3.x.
 
-%package -n Qt5Gui-platformtheme-flatpak
-Summary:	Qt5 Gui platform theme plugin for flatpak
-Summary(pl.UTF-8):	Wtyczka motywów platform Qt5 Gui dla flatpak
+%package -n Qt5Gui-platformtheme-xdgdesktopportal
+Summary:	Qt5 Gui platform theme plugin for xdg-desktop-portal
+Summary(pl.UTF-8):	Wtyczka motywów platform Qt5 Gui dla xdg-desktop-portal
 Group:		Libraries
 Requires:	Qt5Gui = %{version}-%{release}
+Requires:	harfbuzz >= 1.6.0
+Obsoletes:	Qt5Gui-platformtheme-flatpak < 5.12.1
 
-%description -n Qt5Gui-platformtheme-flatpak
-Qt5 Gui platform theme plugin for flatpak.
+%description -n Qt5Gui-platformtheme-xdgdesktopportal
+Qt5 Gui platform theme plugin for xdg-desktop-portal.
 
-%description -n Qt5Gui-platformtheme-flatpak -l pl.UTF-8
-Wtyczka motywów platform Qt5 Gui dla flatpak.
+%description -n Qt5Gui-platformtheme-xdgdesktopportal -l pl.UTF-8
+Wtyczka motywów platform Qt5 Gui dla xdg-desktop-portal.
 
 %package -n Qt5Gui-devel
 Summary:	Qt5 Gui library - development files
@@ -624,6 +647,7 @@ Requires:	OpenGL-devel
 Requires:	Qt5Core-devel = %{version}-%{release}
 Requires:	Qt5Gui = %{version}-%{release}
 Requires:	libpng-devel
+Requires:	Vulkan-Loader-devel
 
 %description -n Qt5Gui-devel
 Header files for Qt5 Gui library.
@@ -652,10 +676,10 @@ Group:		Development/Libraries
 Requires:	Qt5Core-devel = %{version}-%{release}
 
 %description -n Qt5KmsSupport-devel
-Qt5 EglSupport library - development files.
+Qt5 KmsSupport library - development files.
 
 %description -n Qt5KmsSupport-devel -l pl.UTF-8
-Biblioteka Qt5 EglSupport - pliki programistyczne.
+Biblioteka Qt5 KmsSupport - pliki programistyczne.
 
 %package -n Qt5Network
 Summary:	Qt5 Network library
@@ -680,7 +704,7 @@ Summary(pl.UTF-8):	Biblioteka Qt5 Network - pliki programistyczne
 Group:		Development/Libraries
 Requires:	Qt5Core-devel = %{version}-%{release}
 Requires:	Qt5Network = %{version}-%{release}
-Requires:	openssl-devel
+%requires_ge	openssl-devel
 
 %description -n Qt5Network-devel
 Header files for Qt5 Network library.
@@ -757,7 +781,7 @@ Requires:	Qt5Core-devel = %{version}-%{release}
 Requires:	Qt5DBus-devel = %{version}-%{release}
 Requires:	Qt5Gui-devel = %{version}-%{release}
 Requires:	fontconfig-devel
-Requires:	freetype-devel >= 2.1.3
+Requires:	freetype-devel >= 2.2.0
 Requires:	udev-devel
 Requires:	xorg-lib-libX11-devel
 Requires:	xorg-lib-libXext-devel
@@ -981,19 +1005,18 @@ Header files for Qt5 Test library.
 %description -n Qt5Test-devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki Qt5 Test.
 
-%package -n -devel
-Summary:	library - development files
-Summary(pl.UTF-8):	Biblioteka  - pliki programistyczne
+%package -n Qt5VulkanSupport-devel
+Summary:	Qt5 VulkanSupport library - development files
+Summary(pl.UTF-8):	Biblioteka Qt5 VulkanSupport - pliki programistyczne
 Group:		Development/Libraries
 # for (subset of) Qt5Core headers
 Requires:	Qt5Core-devel = %{version}-%{release}
-Requires:	zlib-devel
 
-%description -n -devel
-library - development files.
+%description -n Qt5VulkanSupport-devel
+Qt5 VulkanSupport library - development files.
 
-%description -n -devel -l pl.UTF-8
-Biblioteka - pliki programistyczne.
+%description -n Qt5VulkanSupport-devel -l pl.UTF-8
+Biblioteka Qt5 VulkanSupport - pliki programistyczne.
 
 %package -n Qt5Widgets
 Summary:	Qt5 Widgets library
@@ -1027,6 +1050,19 @@ Header files for Qt5 Widgets library.
 %description -n Qt5Widgets-devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki Qt5 Widgets.
 
+%package -n Qt5XkbCommonSupport-devel
+Summary:	Qt5 XkbCommonSupport library - development files
+Summary(pl.UTF-8):	Biblioteka Qt5 XkbCommonSupport - pliki programistyczne
+Group:		Development/Libraries
+# for (subset of) Qt5Core headers
+Requires:	Qt5Core-devel = %{version}-%{release}
+
+%description -n Qt5XkbCommonSupport-devel
+Qt5 XkbCommonSupport library - development files.
+
+%description -n Qt5XkbCommonSupport-devel -l pl.UTF-8
+Biblioteka Qt5 XkbCommonSupport - pliki programistyczne.
+
 %package -n Qt5Xml
 Summary:	Qt5 Xml library
 Summary(pl.UTF-8):	Biblioteka Qt5 Xml
@@ -1058,9 +1094,7 @@ Pliki nagłówkowe biblioteki Qt5 Xml.
 Summary:	Common part of Qt5 documentation
 Summary(pl.UTF-8):	Część wspólna dokumentacji do Qt5
 Group:		Documentation
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description -n qt5-doc-common
 Common part of Qt5 documentation, global for all components.
@@ -1069,13 +1103,40 @@ Common part of Qt5 documentation, global for all components.
 Część wspólna dokumentacji do Qt5 ("global", dla wszystkich
 elementów).
 
+%package doc
+Summary:	Qt5 application framework base components documentation in HTML format
+Summary(pl.UTF-8):	Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w formacie HTML
+Group:		Documentation
+Requires:	qt5-doc-common = %{version}-%{release}
+BuildArch:	noarch
+
+%description doc
+Qt5 application framework base components documentation in HTML
+format.
+
+%description doc -l pl.UTF-8
+Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w
+formacie HTML.
+
+%package doc-qch
+Summary:	Qt5 application framework base components documentation in QCH format
+Summary(pl.UTF-8):	Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w formacie QCH
+Group:		Documentation
+Requires:	qt5-doc-common = %{version}-%{release}
+BuildArch:	noarch
+
+%description doc-qch
+Qt5 application framework base components documentation in QCH format.
+
+%description doc-qch -l pl.UTF-8
+Dokumentacja podstawowych komponentów szkieletu aplikacji Qt5 w
+formacie QCH.
+
 %package examples
 Summary:	Examples for Qt5 application framework base components
 Summary(pl.UTF-8):	Przykłady do podstawowych komponentów szkieletu aplikacji Qt5
 Group:		X11/Development/Libraries
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description examples
 Examples for Qt5 application framework base components.
@@ -1111,15 +1172,12 @@ Generator plików makefile dla aplikacji Qt5.
 %prep
 %setup -q -n %{orgname}-everywhere-src-%{version} %{?with_qm:-a1}
 %patch0 -p1
-%if "%(rpm -q glibc-devel --qf '%{VERSION}')" >= "2.28"
 %patch1 -p1
-%endif
 
 %{__sed} -i -e 's,usr/X11R6/,usr/,g' mkspecs/linux-g++-64/qmake.conf
 
 # change QMAKE FLAGS to build
 %{__sed} -i -e '
-	s|^\(QMAKE_COMPILER *\)=.*gcc|\1= %{__cc}|;
 	s|^\(QMAKE_CC *\)=.*gcc|\1= %{__cc}|;
 	s|^\(QMAKE_CXX *\)=.*g++|\1= %{__cxx}|;
 	s|^QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO .*|QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g %{rpmcppflags} %{rpmcflags}|;
@@ -1138,6 +1196,14 @@ Generator plików makefile dla aplikacji Qt5.
 	s|^\(QMAKE_STRIP *\)=.*|\1= :|;
 	' mkspecs/common/linux.conf
 
+%{__sed} -i -e '1{
+	s,^#!.*bin/python$,#!%{__python},
+	s,^#!.*bin/env perl,#!%{__perl},
+}' \
+	bin/fixqt4headers.pl \
+	bin/syncqt.pl \
+	mkspecs/features/uikit/devices.py
+
 %build
 # pass OPTFLAGS to build qmake itself with optimization
 export OPTFLAGS="%{rpmcflags}"
@@ -1173,7 +1239,9 @@ COMMONOPT=" \
 	-%{!?with_gtk:no-}gtk \
 	-icu \
 	%{?with_systemd:-journald} \
+	-no-compile-examples \
 	%{!?with_egl:-no-eglfs} \
+	%{!?with_statx:-no-feature-statx} \
 	%{!?with_kms:-no-kms} \
 	%{!?with_libinput:-no-libinput} \
 	-no-rpath \
@@ -1185,21 +1253,23 @@ COMMONOPT=" \
 	%{!?with_sse42:-no-sse4.2} \
 	%{!?with_avx:-no-avx} \
 	%{!?with_avx2:-no-avx2} \
+	-no-use-gold-linker \
 	-openssl-linked \
 	-optimized-qmake \
 	-%{!?with_pch:no-}pch \
-	-reduce-relocations \
+	%{?with_red_reloc:-reduce-relocations} \
 	-sm \
+	-system-doubleconversion \
 	-system-freetype \
+	-system-harfbuzz \
 	-system-libjpeg \
 	-system-libpng \
 	-system-pcre \
 	-system-sqlite \
-	-system-xcb \
-	-system-xkbcommon \
 	-system-zlib \
 	%{?with_tslib:-tslib} \
-	-xinput2 \
+	-xcb \
+	-xkbcommon \
 	%{!?with_db2:-no}-sql-db2 \
 	%{!?with_ibase:-no}-sql-ibase \
 	%{!?with_mysql:-no}-sql-mysql \
@@ -1227,6 +1297,12 @@ fi
 ./configure $COMMONOPT -shared
 
 %{__make}
+%if %{with doc}
+# use just built qdoc instead of requiring already installed qt5-build
+wd="$(pwd)"
+%{__sed} -i -e 's|%{qt5dir}/bin/qdoc|LD_LIBRARY_PATH='${wd}'/lib$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} '${wd}'/bin/qdoc|' src/*/Makefile
+%{__make} docs
+%endif
 
 %if %{with qm}
 export QMAKEPATH=$(pwd)
@@ -1238,7 +1314,7 @@ cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/qt5,%{_bindir},%{_pkgconfigdir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/qt5,%{_bindir},%{_pkgconfigdir},%{qt5dir}/libexec}
 
 # for QtSolutions (qtlockedfile, qtsingleapplication, etc)
 install -d $RPM_BUILD_ROOT%{_includedir}/qt5/QtSolutions
@@ -1246,11 +1322,16 @@ install -d $RPM_BUILD_ROOT%{_includedir}/qt5/QtSolutions
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
+%if %{with doc}
+%{__make} install_docs \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
+%endif
+
 %if %{with qm}
 %{__make} -C qttranslations-everywhere-src-%{version} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 # keep only qt and qtbase
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/qt5/translations/{assistant,designer,linguist,qmlviewer,qt_help,qtconnectivity,qtdeclarative,qtlocation,qtmultimedia,qtquick1,qtquickcontrols,qtquickcontrols2,qtscript,qtserialport,qtwebengine,qtwebsockets,qtxmlpatterns}_*.qm
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/qt5/translations/{assistant,designer,linguist,qt_help,qtconnectivity,qtdeclarative,qtlocation,qtmultimedia,qtquickcontrols,qtquickcontrols2,qtscript,qtserialport,qtwebengine,qtwebsockets,qtxmlpatterns}_*.qm
 %else
 install -d $RPM_BUILD_ROOT%{_datadir}/qt5/translations
 %endif
@@ -1312,7 +1393,7 @@ ifecho_tree examples %{_examplesdir}/qt5/qpa
 ifecho_tree examples %{_examplesdir}/qt5/qtconcurrent
 ifecho_tree examples %{_examplesdir}/qt5/qtestlib
 ifecho_tree examples %{_examplesdir}/qt5/sql
-ifecho_tree examples %{_examplesdir}/qt5/touch
+ifecho_tree examples %{_examplesdir}/qt5/vulkan
 ifecho_tree examples %{_examplesdir}/qt5/widgets
 ifecho_tree examples %{_examplesdir}/qt5/xml
 
@@ -1331,6 +1412,8 @@ find_qt5_qm qt >> qtbase.lang
 find_qt5_qm qtbase >> qtbase.lang
 %endif
 
+install -d $RPM_BUILD_ROOT%{qt5dir}/plugins/styles
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1384,6 +1467,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libQt5AccessibilitySupport.prl
 %{_libdir}/libQt5LinuxAccessibilitySupport.a
 %{_libdir}/libQt5LinuxAccessibilitySupport.prl
+%{_libdir}/cmake/Qt5AccessibilitySupport
+%{_libdir}/cmake/Qt5LinuxAccessibilitySupport
 %{qt5dir}/mkspecs/modules/qt_lib_accessibility_support_private.pri
 %{qt5dir}/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri
 
@@ -1411,12 +1496,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n Qt5Core -f qtbase.lang
 %defattr(644,root,root,755)
-%doc LGPL_EXCEPTION.txt header.* dist/{README,changes-*}
+%doc dist/{README,changes-*}
 %attr(755,root,root) %{_libdir}/libQt5Core.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQt5Core.so.5
 %dir %{_sysconfdir}/qt5
 %dir %{qt5dir}
 %dir %{qt5dir}/bin
+%dir %{qt5dir}/libexec
 %dir %{qt5dir}/mkspecs
 %dir %{qt5dir}/mkspecs/modules
 %dir %{qt5dir}/plugins
@@ -1427,6 +1513,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt5Core.so
 %{_libdir}/libQt5Core.prl
+%dir %{_libdir}/metatypes
+%{_libdir}/metatypes/qt5core_metatypes.json
 %dir %{_includedir}/qt5
 %dir %{_includedir}/qt5/QtSolutions
 %{_includedir}/qt5/QtCore
@@ -1435,6 +1523,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cmake/Qt5Core
 %{qt5dir}/mkspecs/modules/qt_lib_core.pri
 %{qt5dir}/mkspecs/modules/qt_lib_core_private.pri
+%attr(755,root,root) %{qt5dir}/bin/tracegen
 
 %files -n Qt5DBus
 %defattr(644,root,root,755)
@@ -1456,6 +1545,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtDeviceDiscoverySupport
 %{_libdir}/libQt5DeviceDiscoverySupport.a
 %{_libdir}/libQt5DeviceDiscoverySupport.prl
+%{_libdir}/cmake/Qt5DeviceDiscoverySupport
 %{qt5dir}/mkspecs/modules/qt_lib_devicediscovery_support_private.pri
 
 %files -n Qt5EdidSupport-devel
@@ -1463,6 +1553,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtEdidSupport
 %{_libdir}/libQt5EdidSupport.a
 %{_libdir}/libQt5EdidSupport.prl
+%{_libdir}/cmake/Qt5EdidSupport
 %{qt5dir}/mkspecs/modules/qt_lib_edid_support_private.pri
 
 %files -n Qt5EglSupport-devel
@@ -1470,6 +1561,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtEglSupport
 %{_libdir}/libQt5EglSupport.a
 %{_libdir}/libQt5EglSupport.prl
+%{_libdir}/cmake/Qt5EglSupport
 %{qt5dir}/mkspecs/modules/qt_lib_egl_support_private.pri
 
 %files -n Qt5EventDispatcherSupport-devel
@@ -1477,6 +1569,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtEventDispatcherSupport
 %{_libdir}/libQt5EventDispatcherSupport.a
 %{_libdir}/libQt5EventDispatcherSupport.prl
+%{_libdir}/cmake/Qt5EventDispatcherSupport
 %{qt5dir}/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri
 
 %files -n Qt5FbSupport-devel
@@ -1484,6 +1577,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtFbSupport
 %{_libdir}/libQt5FbSupport.a
 %{_libdir}/libQt5FbSupport.prl
+%{_libdir}/cmake/Qt5FbSupport
 %{qt5dir}/mkspecs/modules/qt_lib_fb_support_private.pri
 
 %files -n Qt5FontDatabaseSupport-devel
@@ -1491,6 +1585,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtFontDatabaseSupport
 %{_libdir}/libQt5FontDatabaseSupport.a
 %{_libdir}/libQt5FontDatabaseSupport.prl
+%{_libdir}/cmake/Qt5FontDatabaseSupport
 %{qt5dir}/mkspecs/modules/qt_lib_fontdatabase_support_private.pri
 
 %files -n Qt5GlxSupport-devel
@@ -1498,6 +1593,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtGlxSupport
 %{_libdir}/libQt5GlxSupport.a
 %{_libdir}/libQt5GlxSupport.prl
+%{_libdir}/cmake/Qt5GlxSupport
 %{qt5dir}/mkspecs/modules/qt_lib_glx_support_private.pri
 
 %files -n Qt5Gui
@@ -1591,6 +1687,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_includedir}/qt5/QtEglFSDeviceIntegration
 %attr(755,root,root) %{_libdir}/libQt5EglFSDeviceIntegration.so
+%{_libdir}/cmake/Qt5EglFSDeviceIntegration
 %{_libdir}/libQt5EglFSDeviceIntegration.prl
 %{qt5dir}/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri
 
@@ -1607,6 +1704,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt5EglFsKmsSupport.so
 %{_libdir}/libQt5EglFsKmsSupport.prl
+%{_libdir}/cmake/Qt5EglFsKmsSupport
 %{_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSKmsEglDeviceIntegrationPlugin.cmake
 %{_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSKmsGbmIntegrationPlugin.cmake
 %{qt5dir}/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri
@@ -1647,6 +1745,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt5XcbQpa.so
 %{_libdir}/libQt5XcbQpa.prl
+%{_libdir}/cmake/Qt5XcbQpa
 %{qt5dir}/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri
 
 %files -n Qt5Gui-platform-xcb-egl
@@ -1667,16 +1766,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cmake/Qt5Gui/Qt5Gui_QGtk3ThemePlugin.cmake
 %endif
 
-%files -n Qt5Gui-platformtheme-flatpak
+%files -n Qt5Gui-platformtheme-xdgdesktopportal
 %defattr(644,root,root,755)
-%attr(755,root,root) %{qt5dir}/plugins/platformthemes/libqflatpak.so
-%{_libdir}/cmake/Qt5Gui/Qt5Gui_QFlatpakThemePlugin.cmake
+%attr(755,root,root) %{qt5dir}/plugins/platformthemes/libqxdgdesktopportal.so
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QXdgDesktopPortalThemePlugin.cmake
 
 %files -n Qt5Gui-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{qt5dir}/bin/qvkgen
 %attr(755,root,root) %{_libdir}/libQt5Gui.so
 %{_libdir}/libQt5Gui.prl
+%{_libdir}/metatypes/qt5gui_metatypes.json
 %{_includedir}/qt5/QtGui
 %{_includedir}/qt5/QtPlatformHeaders
 %{_pkgconfigdir}/Qt5Gui.pc
@@ -1700,6 +1800,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtInputSupport
 %{_libdir}/libQt5InputSupport.a
 %{_libdir}/libQt5InputSupport.prl
+%{_libdir}/cmake/Qt5InputSupport
 %{qt5dir}/mkspecs/modules/qt_lib_input_support_private.pri
 
 %files -n Qt5KmsSupport-devel
@@ -1707,6 +1808,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtKmsSupport
 %{_libdir}/libQt5KmsSupport.a
 %{_libdir}/libQt5KmsSupport.prl
+%{_libdir}/cmake/Qt5KmsSupport
 %{qt5dir}/mkspecs/modules/qt_lib_kms_support_private.pri
 
 %files -n Qt5Network
@@ -1766,6 +1868,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtPlatformCompositorSupport
 %{_libdir}/libQt5PlatformCompositorSupport.a
 %{_libdir}/libQt5PlatformCompositorSupport.prl
+%{_libdir}/cmake/Qt5PlatformCompositorSupport
 %{qt5dir}/mkspecs/modules/qt_lib_platformcompositor_support_private.pri
 
 %files -n Qt5PrintSupport
@@ -1797,6 +1900,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtServiceSupport
 %{_libdir}/libQt5ServiceSupport.a
 %{_libdir}/libQt5ServiceSupport.prl
+%{_libdir}/cmake/Qt5ServiceSupport
 %{qt5dir}/mkspecs/modules/qt_lib_service_support_private.pri
 
 %files -n Qt5Sql
@@ -1910,17 +2014,28 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtThemeSupport
 %{_libdir}/libQt5ThemeSupport.a
 %{_libdir}/libQt5ThemeSupport.prl
+%{_libdir}/cmake/Qt5ThemeSupport
 %{qt5dir}/mkspecs/modules/qt_lib_theme_support_private.pri
 
+%files -n Qt5VulkanSupport-devel
+%defattr(644,root,root,755)
+%{_includedir}/qt5/QtVulkanSupport
+%{_libdir}/libQt5VulkanSupport.a
+%{_libdir}/libQt5VulkanSupport.prl
+%{_libdir}/cmake/Qt5VulkanSupport
+%{qt5dir}/mkspecs/modules/qt_lib_vulkan_support_private.pri
+
 %files -n Qt5Widgets
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt5Widgets.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQt5Widgets.so.5
+%dir %{qt5dir}/plugins/styles
 
 %files -n Qt5Widgets-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt5Widgets.so
 %{_libdir}/libQt5Widgets.prl
+%{_libdir}/metatypes/qt5widgets_metatypes.json
 %{_includedir}/qt5/QtWidgets
 %{_pkgconfigdir}/Qt5Widgets.pc
 %dir %{_libdir}/cmake/Qt5Widgets
@@ -1929,6 +2044,14 @@ rm -rf $RPM_BUILD_ROOT
 %{qt5dir}/mkspecs/modules/qt_lib_widgets.pri
 %{qt5dir}/mkspecs/modules/qt_lib_widgets_private.pri
 
+%files -n Qt5XkbCommonSupport-devel
+%defattr(644,root,root,755)
+%{_includedir}/qt5/QtXkbCommonSupport
+%{_libdir}/libQt5XkbCommonSupport.a
+%{_libdir}/libQt5XkbCommonSupport.prl
+%{_libdir}/cmake/Qt5XkbCommonSupport
+%{qt5dir}/mkspecs/modules/qt_lib_xkbcommon_support_private.pri
+
 %files -n Qt5Xml
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt5Xml.so.*.*.*
@@ -1947,8 +2070,43 @@ rm -rf $RPM_BUILD_ROOT
 %files -n qt5-doc-common
 %defattr(644,root,root,755)
 %dir %{_docdir}/qt5-doc
+%{_docdir}/qt5-doc/config
 %{_docdir}/qt5-doc/global
 
+%if %{with doc}
+%files doc
+%defattr(644,root,root,755)
+%{_docdir}/qt5-doc/qmake
+%{_docdir}/qt5-doc/qtconcurrent
+%{_docdir}/qt5-doc/qtcore
+%{_docdir}/qt5-doc/qtdbus
+%{_docdir}/qt5-doc/qtgui
+%{_docdir}/qt5-doc/qtnetwork
+%{_docdir}/qt5-doc/qtopengl
+%{_docdir}/qt5-doc/qtplatformheaders
+%{_docdir}/qt5-doc/qtprintsupport
+%{_docdir}/qt5-doc/qtsql
+%{_docdir}/qt5-doc/qttestlib
+%{_docdir}/qt5-doc/qtwidgets
+%{_docdir}/qt5-doc/qtxml
+
+%files doc-qch
+%defattr(644,root,root,755)
+%{_docdir}/qt5-doc/qmake.qch
+%{_docdir}/qt5-doc/qtconcurrent.qch
+%{_docdir}/qt5-doc/qtcore.qch
+%{_docdir}/qt5-doc/qtdbus.qch
+%{_docdir}/qt5-doc/qtgui.qch
+%{_docdir}/qt5-doc/qtnetwork.qch
+%{_docdir}/qt5-doc/qtopengl.qch
+%{_docdir}/qt5-doc/qtplatformheaders.qch
+%{_docdir}/qt5-doc/qtprintsupport.qch
+%{_docdir}/qt5-doc/qtsql.qch
+%{_docdir}/qt5-doc/qttestlib.qch
+%{_docdir}/qt5-doc/qtwidgets.qch
+%{_docdir}/qt5-doc/qtxml.qch
+%endif
+
 %files examples -f examples.files
 %defattr(644,root,root,755)
 %dir %{_examplesdir}/qt5
@@ -2000,6 +2158,7 @@ rm -rf $RPM_BUILD_ROOT
 %{qt5dir}/mkspecs/qnx-*
 %{qt5dir}/mkspecs/solaris-*
 %{qt5dir}/mkspecs/unsupported
+%{qt5dir}/mkspecs/wasm-emscripten
 %{qt5dir}/mkspecs/win32-*
 %{qt5dir}/mkspecs/winrt-*
 %{qt5dir}/mkspecs/*.pri