X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=qt5-qtbase.spec;h=ddcc7df98c6eefba55f93c2d1326d6d68f0a869e;hb=c66edc8;hp=182371734cfe7742b6f1b4ed06b7cc5da45c6b49;hpb=c05a48fbf49ac07847745aca4e1efcbab6b2b7c6;p=packages%2Fqt5-qtbase.git

diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 1823717..ddcc7df 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -1,5 +1,3 @@
-# TODO: separate more plugins? (think of qxcb when there are more commonly used platforms)
-#
 # Note on packaging .cmake files for plugins:
 # Base Qt5${component}Config.cmake file includes all existing Qt5${component}_*Plugin.cmake
 # files, which trigger check for presence of plugin module in filesystem.
@@ -8,6 +6,7 @@
 #
 # Conditional build:
 %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	qch		# QCH documentation
 %bcond_without	qm		# QM translations
@@ -17,9 +16,11 @@
 %bcond_without	egl		# EGL (EGLFS, minimal EGL) platform support
 %bcond_without	gtk		# GTK+ theme integration
 %bcond_without	kms		# KMS platform support
+%bcond_without	libinput	# libinput support
 %bcond_without	pch		# pch (pre-compiled headers) in qmake
 %bcond_with	systemd		# logging to journald
 %bcond_without	tslib		# tslib support
+%bcond_with	openvg		# OpenVG support
 # -- databases
 %bcond_without	freetds		# TDS (Sybase/MS SQL) plugin
 %bcond_without	mysql		# MySQL plugin
@@ -39,42 +40,47 @@
 %bcond_with	avx		# use AVX instructions (Intel since Sandy Bridge, AMD since Bulldozer)
 %bcond_with	avx2		# use AVX2 instructions (Intel since Haswell)
 
-%ifnarch %{ix86} %{x8664} sparc sparcv9 alpha ppc
+%ifnarch %{ix86} %{x8664} x32 sparc sparcv9 alpha ppc
 %undefine	with_ibase
 %endif
 %ifarch	athlon
 %define		with_3dnow	1
 %endif
-%ifarch athlon pentium3 pentium4 %{x8664}
+%ifarch athlon pentium3 pentium4 %{x8664} x32
 %define		with_mmx	1
 %endif
-%ifarch pentium4 %{x8664}
+%ifarch pentium4 %{x8664} x32
 %define		with_sse2	1
 %endif
 
-%define		icu_abi		54
+%if %{with bootstrap}
+%undefine	with_qch
+%undefine	with_qm
+%endif
+
+%define		icu_abi		58
 %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.3.2
-Release:	1
+Version:	5.5.1
+Release:	8.1
 # See LGPL_EXCEPTION.txt for exception details
 License:	LGPL v2 with Digia Qt LGPL Exception v1.1 or GPL v3
 Group:		X11/Libraries
-Source0:	http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
-# Source0-md5:	563e2b10274171f1184b3fd7260b4991
-Source1:	http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/qttranslations-opensource-src-%{version}.tar.xz
-# Source1-md5:	f2332bedc9c1ac8e762c62cfa71aa640
+Source0:	http://download.qt.io/official_releases/qt/5.5/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
+# Source0-md5:	687e2b122fa2c3390b5e20a166d38038
+Source1:	http://download.qt.io/official_releases/qt/5.5/%{version}/submodules/qttranslations-opensource-src-%{version}.tar.xz
+# Source1-md5:	1f89d53fe759db123b4b6d9de9d9e8c9
 Patch0:		qtbase-oracle-instantclient.patch
 Patch1:		%{name}-system_cacerts.patch
-URL:		http://qt-project.org/
+URL:		http://www.qt.io/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 BuildRequires:	EGL-devel
 %{?with_ibase:BuildRequires:	Firebird-devel}
-BuildRequires:	Mesa-libOpenVG-devel
+%{?with_openvg:BuildRequires:	Mesa-libOpenVG-devel}
 %{?with_kms:BuildRequires:	Mesa-libgbm-devel}
 BuildRequires:	OpenGL-devel
 %{?with_kms:BuildRequires:	OpenGLESv2-devel}
@@ -93,6 +99,7 @@ BuildRequires:	glib2-devel >= 2.0.0
 # see dependency on libicu version below
 BuildRequires:	libicu-devel < %{next_icu_abi}
 BuildRequires:	libicu-devel >= %{icu_abi}
+%{?with_libinput:BuildRequires:	libinput-devel}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 2:1.0.8
 BuildRequires:	libstdc++-devel
@@ -130,6 +137,7 @@ 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:	xz
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -258,12 +266,8 @@ Summary:	Qt5 Gui library
 Summary(pl.UTF-8):	Biblioteka Qt5 Gui
 Group:		Libraries
 Requires:	Qt5Core = %{version}-%{release}
-# for:
-# - ibus platforminputcontext plugin
-# - qxcb platform plugin
+# for ibus platforminputcontext plugin
 Requires:	Qt5DBus = %{version}-%{release}
-# for qxcb platform plugin
-Requires:	libxcb >= 1.10
 # for compose platforminputcontext plugin
 Requires:	xorg-lib-libxkbcommon >= 0.4.1
 
@@ -275,6 +279,20 @@ applications written with Qt 5.
 Biblioteka Qt5 Gui udostępnia podstawową funkcjonalność dla
 graficznych aplikacji napisanych z użyciem Qt 5.
 
+%package -n Qt5Gui-generic-libinput
+Summary:	Qt5 Gui generic input plugin for libinput
+Summary(pl.UTF-8):	Ogólna wtyczka wejścia Qt5 Gui z libinput
+Group:		Libraries
+Requires:	Qt5Gui = %{version}-%{release}
+
+%description -n Qt5Gui-generic-libinput
+Qt5 Gui generic input plugin to get mouse, keyboard and touch events
+via libinput.
+
+%description -n Qt5Gui-generic-libinput -l pl.UTF-8
+Ogólna wtyczka wejścia Qt5 Gui do pobierania zdarzeń myszy, klawiatury
+i dotykowych poprzez libinput.
+
 %package -n Qt5Gui-generic-tslib
 Summary:	Qt5 Gui generic input plugin for TSlib (touchscreen panel events)
 Summary(pl.UTF-8):	Ogólna wtyczka wejścia Qt5 Gui z TSlib (zdarzeń z paneli dotykowych)
@@ -287,6 +305,19 @@ Qt5 Gui generic input plugin for TSlib (touchscreen panel events).
 %description -n Qt5Gui-generic-tslib -l pl.UTF-8
 Ogólna wtyczka wejścia Qt5 Gui z TSlib (zdarzeń z paneli dotykowych).
 
+%package -n Qt5Gui-generic-tuiotouch
+Summary:	Qt5 Gui generic input plugin for TuioTouch
+Summary(pl.UTF-8):	Ogólna wtyczka wejścia Qt5 Gui z TuioTouch
+Group:		Libraries
+Requires:	Qt5Gui = %{version}-%{release}
+Requires:	Qt5Network = %{version}-%{release}
+
+%description -n Qt5Gui-generic-tuiotouch
+Qt5 Gui generic input plugin for TuioTouch.
+
+%description -n Qt5Gui-generic-tuiotouch -l pl.UTF-8
+Ogólna wtyczka wejścia Qt5 Gui z TuioTouch.
+
 %package -n Qt5Gui-platform-directfb
 Summary:	Qt5 Gui platform plugin for DirectFB
 Summary(pl.UTF-8):	Wtyczka platformy Qt5 Gui dla DirectFB
@@ -299,29 +330,118 @@ Qt5 Gui platform plugin for DirectFB.
 %description -n Qt5Gui-platform-directfb -l pl.UTF-8
 Wtyczka platformy Qt5 Gui dla DirectFB.
 
-%package -n Qt5Gui-platform-kms
-Summary:	Qt5 Gui platform plugin for KMS
-Summary(pl.UTF-8):	Wtyczka platformy Qt5 Gui dla KMS
+%package -n Qt5Gui-platform-egl
+Summary:	Qt5 Gui platform plugin for minimal EGL
+Summary(pl.UTF-8):	Wtyczka platformy Qt5 Gui dla minimalnego EGL
 Group:		Libraries
 Requires:	Qt5Gui = %{version}-%{release}
 
-%description -n Qt5Gui-platform-kms
-Qt5 Gui platform plugin for KMS.
+%description -n Qt5Gui-platform-egl
+Qt5 Gui platform plugin for minimal EGL.
 
-%description -n Qt5Gui-platform-kms -l pl.UTF-8
-Wtyczka platformy Qt5 Gui dla KMS.
+%description -n Qt5Gui-platform-egl -l pl.UTF-8
+Wtyczki platformy Qt5 Gui dla minimalnego EGL.
 
-%package -n Qt5Gui-platform-egl
-Summary:	Qt5 Gui platform plugins for EGL
-Summary(pl.UTF-8):	Wtyczki platform Qt5 Gui dla EGL
+%package -n Qt5Gui-platform-eglfs
+Summary:	Qt5 Gui platform plugin and library for EglFs integration layer
+Summary(pl.UTF-8):	Wtyczka platformy Qt5 Gui oraz biblioteka warstwy integracyjnej EglFs
 Group:		Libraries
 Requires:	Qt5Gui = %{version}-%{release}
 
-%description -n Qt5Gui-platform-egl
-Qt5 Gui platform plugins for EGL.
+%description -n Qt5Gui-platform-eglfs
+Qt5 Gui platform plugin and library for EglFs integration layer.
 
-%description -n Qt5Gui-platform-egl -l pl.UTF-8
-Wtyczki platform Qt5 Gui dla EGL.
+%description -n Qt5Gui-platform-eglfs -l pl.UTF-8
+Wtyczka platformy Qt5 Gui oraz biblioteka warstwy integracyjnej EglFs.
+
+%package -n Qt5Gui-platform-eglfs-devel
+Summary:	Development files for Qt5 EglFs integration layer
+Summary(pl.UTF-8):	Pliki programistyczne warstwy integracyjnej Qt5 EglFs
+Group:		Development/Libraries
+Requires:	Qt5Gui-platform-eglfs = %{version}-%{release}
+
+%description -n Qt5Gui-platform-eglfs-devel
+Development files for Qt5 EglFs integration layer.
+
+%description -n Qt5Gui-platform-eglfs-devel -l pl.UTF-8
+Pliki programistyczne warstwy integracyjnej Qt5 EglFs.
+
+%package -n Qt5Gui-platform-eglfs-kms
+Summary:	Qt5 EglFs integration plugin for KMS
+Summary(pl.UTF-8):	Wtyczka integracji Qt5 EglFs dla KMS
+Group:		Libraries
+Requires:	Qt5Gui-platform-eglfs = %{version}-%{release}
+Obsoletes:	Qt5Gui-platform-kms < 5.5
+
+%description -n Qt5Gui-platform-eglfs-kms
+Qt5 EglFs integration plugin for KMS.
+
+%description -n Qt5Gui-platform-eglfs-kms -l pl.UTF-8
+Wtyczka integracji Qt5 EglFs dla KMS.
+
+%package -n Qt5Gui-platform-eglfs-x11
+Summary:	Qt5 EglFs integration plugin for X11
+Summary(pl.UTF-8):	Wtyczka integracji Qt5 EglFs dla X11
+Group:		Libraries
+Requires:	Qt5Gui-platform-eglfs = %{version}-%{release}
+
+%description -n Qt5Gui-platform-eglfs-x11
+Qt5 EglFs integration plugin for X11.
+
+%description -n Qt5Gui-platform-eglfs-x11 -l pl.UTF-8
+Wtyczka integracji Qt5 EglFs dla X11.
+
+%package -n Qt5Gui-platform-xcb
+Summary:	Qt5 Gui platform plugin and library for XcbQpa integration layer
+Summary(pl.UTF-8):	Wtyczka platformy Qt5 Gui oraz biblioteka warstwy integracyjnej XcbQpa
+Group:		Libraries
+Requires:	Qt5DBus = %{version}-%{release}
+Requires:	Qt5Gui = %{version}-%{release}
+Requires:	libxcb >= 1.10
+Requires:	xorg-lib-libxkbcommon-x11 >= 0.4.1
+
+%description -n Qt5Gui-platform-xcb
+Qt5 Gui platform plugin and library for XcbQpa integration layer.
+
+%description -n Qt5Gui-platform-xcb -l pl.UTF-8
+Wtyczka platformy Qt5 Gui oraz biblioteka warstwy integracyjnej
+XcbQpa.
+
+%package -n Qt5Gui-platform-xcb-devel
+Summary:	Development files for Qt5 XcbQpa integration layer
+Summary(pl.UTF-8):	Pliki programistyczne warstwy integracyjnej Qt5 XcbQpa
+Group:		Development/Libraries
+Requires:	Qt5Gui-platform-eglfs = %{version}-%{release}
+
+%description -n Qt5Gui-platform-xcb-devel
+Development files for Qt5 XcbQpa integration layer.
+
+%description -n Qt5Gui-platform-xcb-devel -l pl.UTF-8
+Pliki programistyczne warstwy integracyjnej Qt5 XcbQpa.
+
+%package -n Qt5Gui-platform-xcb-egl
+Summary:	Qt5 XcbQpa integration plugin for EGL
+Summary(pl.UTF-8):	Wtyczka integracji Qt5 XcbQpa dla EGL
+Group:		Libraries
+Requires:	Qt5Gui-platform-xcb = %{version}-%{release}
+
+%description -n Qt5Gui-platform-xcb-egl
+Qt5 XcbQpa integration plugin for EGL.
+
+%description -n Qt5Gui-platform-xcb-egl -l pl.UTF-8
+Wtyczka integracji Qt5 XcbQpa dla EGL.
+
+%package -n Qt5Gui-platform-xcb-glx
+Summary:	Qt5 XcbQpa integration plugin for GLX
+Summary(pl.UTF-8):	Wtyczka integracji Qt5 XcbQpa dla GLX
+Group:		Libraries
+Requires:	Qt5Gui-platform-xcb = %{version}-%{release}
+
+%description -n Qt5Gui-platform-xcb-glx
+Qt5 XcbQpa integration plugin for GLX.
+
+%description -n Qt5Gui-platform-xcb-glx -l pl.UTF-8
+Wtyczka integracji Qt5 XcbQpa dla GLX.
 
 %package -n Qt5Gui-platformtheme-gtk2
 Summary:	Qt5 Gui platform theme plugin for GTK+ 2.x
@@ -357,6 +477,7 @@ Group:		Libraries
 Requires:	Qt5Core = %{version}-%{release}
 # for bearer plugins (qconnman, qnm):
 Requires:	Qt5DBus = %{version}-%{release}
+%requires_ge_to	openssl	openssl-devel
 
 %description -n Qt5Network
 The Qt5 Network library provides classes to make network programming
@@ -655,13 +776,11 @@ Requires:	Qt5Gui = %{version}-%{release}
 
 %description -n Qt5Widgets
 The Qt5 Widgets library extends Qt 5 GUI with C++ widget
-functionality. This package contains also qtaccessiblewidgets plugin
-for Qt5 Gui library.
+functionality.
 
 %description -n Qt5Widgets -l pl.UTF-8
 Biblioteka Qt5 Widgets rozszerza graficzny interfejs Qt 5 o
-funkcjonalność widgetów C++. Pakiet zawiera także wtyczkę
-qtaccessiblewidgets dla biblioteki Qt5 Gui.
+funkcjonalność widgetów C++.
 
 %package -n Qt5Widgets-devel
 Summary:	Qt5 Widgets library - development files
@@ -768,7 +887,7 @@ Przykłady do podstawowych komponentów szkieletu aplikacji Qt5.
 
 %package -n qt5-build
 Summary:	Qt5 build tools
-Summary(pl.UTF-8):	Narzędzia do budowania dla Qt4
+Summary(pl.UTF-8):	Narzędzia do budowania dla Qt5
 Group:		Development/Tools
 
 %description -n qt5-build
@@ -851,6 +970,7 @@ COMMONOPT=" \
 	-dbus-linked \
 	-fontconfig \
 	-glib \
+	-gstreamer 1.0 \
 	-%{!?with_gtk:no-}gtkstyle \
 	-iconv \
 	-icu \
@@ -859,6 +979,7 @@ COMMONOPT=" \
 	-nis \
 	%{!?with_egl:-no-eglfs} \
 	%{!?with_kms:-no-kms} \
+	%{!?with_libinput:-no-libinput} \
 	-no-rpath \
 	-no-separate-debug-info \
 	%{!?with_sse2:-no-sse2} \
@@ -882,6 +1003,7 @@ COMMONOPT=" \
 	-system-xkbcommon \
 	-system-zlib \
 	%{?with_tslib:-tslib} \
+	-%{!?with_openvg:no-}openvg \
 	-xcursor \
 	-xfixes \
 	-xinerama \
@@ -950,6 +1072,9 @@ cd ..
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/qt5,%{_bindir},%{_pkgconfigdir}}
 
+# for QtSolutions (qtlockedfile, qtsingleapplication, etc)
+install -d $RPM_BUILD_ROOT%{_includedir}/qt5/QtSolutions
+
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
@@ -960,7 +1085,7 @@ install -d $RPM_BUILD_ROOT{/etc/qt5,%{_bindir},%{_pkgconfigdir}}
 %{__make} -C qttranslations-opensource-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,qtconfig,qtconnectivity,qtdeclarative,qtlocation,qtmultimedia,qtquick1,qtscript,qtxmlpatterns}_*.qm
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/qt5/translations/{assistant,designer,linguist,qmlviewer,qt_help,qtconfig,qtconnectivity,qtdeclarative,qtlocation,qtmultimedia,qtquick1,qtquickcontrols,qtscript,qtwebsockets,qtxmlpatterns}_*.qm
 %else
 install -d $RPM_BUILD_ROOT%{_datadir}/qt5/translations
 %endif
@@ -978,11 +1103,8 @@ install -d $RPM_BUILD_ROOT%{qt5dir}/plugins/iconengines
 # actually drop *.la, follow policy of not packaging them when *.pc exist
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libQt5*.la
 
-# install tools
-install bin/findtr	$RPM_BUILD_ROOT%{qt5dir}/bin
 # symlinks in system bin dir
 cd $RPM_BUILD_ROOT%{_bindir}
-ln -sf ../%{_lib}/qt5/bin/findtr findtr-qt5
 ln -sf ../%{_lib}/qt5/bin/moc moc-qt5
 ln -sf ../%{_lib}/qt5/bin/qmake qmake-qt5
 ln -sf ../%{_lib}/qt5/bin/uic uic-qt5
@@ -1016,18 +1138,15 @@ ifecho_tree() {
 }
 
 echo "%defattr(644,root,root,755)" > examples.files
+ifecho_tree examples %{_examplesdir}/qt5/corelib
 ifecho_tree examples %{_examplesdir}/qt5/dbus
 ifecho_tree examples %{_examplesdir}/qt5/gui
-ifecho_tree examples %{_examplesdir}/qt5/ipc
-ifecho_tree examples %{_examplesdir}/qt5/json
 ifecho_tree examples %{_examplesdir}/qt5/network
 ifecho_tree examples %{_examplesdir}/qt5/opengl
 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/threads
-ifecho_tree examples %{_examplesdir}/qt5/tools
 ifecho_tree examples %{_examplesdir}/qt5/touch
 ifecho_tree examples %{_examplesdir}/qt5/widgets
 ifecho_tree examples %{_examplesdir}/qt5/xml
@@ -1062,6 +1181,12 @@ rm -rf $RPM_BUILD_ROOT
 %post	-n Qt5Gui -p /sbin/ldconfig
 %postun	-n Qt5Gui -p /sbin/ldconfig
 
+%post	-n Qt5Gui-platform-eglfs -p /sbin/ldconfig
+%postun	-n Qt5Gui-platform-eglfs -p /sbin/ldconfig
+
+%post	-n Qt5Gui-platform-xcb -p /sbin/ldconfig
+%postun	-n Qt5Gui-platform-xcb -p /sbin/ldconfig
+
 %post	-n Qt5Network -p /sbin/ldconfig
 %postun	-n Qt5Network -p /sbin/ldconfig
 
@@ -1125,6 +1250,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libQt5Core.so
 %{_libdir}/libQt5Core.prl
 %dir %{_includedir}/qt5
+%dir %{_includedir}/qt5/QtSolutions
 %{_includedir}/qt5/QtCore
 %{_pkgconfigdir}/Qt5Core.pc
 %{_libdir}/cmake/Qt5
@@ -1151,8 +1277,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt5Gui.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQt5Gui.so.5
-# loaded from src/gui/accessible/qaccessible.cpp
-%dir %{qt5dir}/plugins/accessible
 # loaded from src/gui/kernel/qgenericpluginfactory.cpp
 %dir %{qt5dir}/plugins/generic
 # R: udev-libs (by all qevdev* plugins)
@@ -1181,13 +1305,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{qt5dir}/plugins/platforms/libqminimal.so
 # R: freetype libX11 libXrender
 %attr(755,root,root) %{qt5dir}/plugins/platforms/libqoffscreen.so
-# R: Qt5DBus libxcb xcb-* xorg-* ...
-%attr(755,root,root) %{qt5dir}/plugins/platforms/libqxcb.so
 # loaded from src/gui/kernel/qplatformthemefactory.cpp
 %dir %{qt5dir}/plugins/platformthemes
 # common for base -devel and plugin-specific files
 %dir %{_libdir}/cmake/Qt5Gui
 
+%if %{with libinput}
+%files -n Qt5Gui-generic-libinput
+%defattr(644,root,root,755)
+# R: libinput libxkbcommon udev
+%attr(755,root,root) %{qt5dir}/plugins/generic/libqlibinputplugin.so
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QLibInputPlugin.cmake
+%endif
+
 %if %{with tslib}
 %files -n Qt5Gui-generic-tslib
 %defattr(644,root,root,755)
@@ -1196,6 +1326,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cmake/Qt5Gui/Qt5Gui_QTsLibPlugin.cmake
 %endif
 
+%files -n Qt5Gui-generic-tuiotouch
+%defattr(644,root,root,755)
+# R: Qt5Network
+%attr(755,root,root) %{qt5dir}/plugins/generic/libqtuiotouchplugin.so
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QTuioTouchPlugin.cmake
+
 %if %{with directfb}
 %files -n Qt5Gui-platform-directfb
 %defattr(644,root,root,755)
@@ -1204,24 +1340,74 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cmake/Qt5Gui/Qt5Gui_QDirectFbIntegrationPlugin.cmake
 %endif
 
-%if %{with kms}
-%files -n Qt5Gui-platform-kms
+%if %{with egl}
+%files -n Qt5Gui-platform-egl
 %defattr(644,root,root,755)
-# R: EGL GLESv2 libdrm libgbm udev-libs
-%attr(755,root,root) %{qt5dir}/plugins/platforms/libqkms.so
-%{_libdir}/cmake/Qt5Gui/Qt5Gui_QKmsIntegrationPlugin.cmake
+# R: egl fontconfig freetype
+%attr(755,root,root) %{qt5dir}/plugins/platforms/libqminimalegl.so
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake
 %endif
 
-%if %{with egl}
-%files -n Qt5Gui-platform-egl
+%files -n Qt5Gui-platform-eglfs
 %defattr(644,root,root,755)
+# R: Qt5Gui Qt5Core EGL GL ts fontconfig freetype glib2 udev mtdev
+%attr(755,root,root) %{_libdir}/libQt5EglDeviceIntegration.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQt5EglDeviceIntegration.so.5
 # R: egl fontconfig freetype (for two following)
 %attr(755,root,root) %{qt5dir}/plugins/platforms/libqeglfs.so
-%attr(755,root,root) %{qt5dir}/plugins/platforms/libqminimalegl.so
 %{_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
-%{_libdir}/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake
+# loaded from src/plugins/platforms/eglfs/qeglfsdeviceintegration.cpp
+%dir %{qt5dir}/plugins/egldeviceintegrations
+
+%files -n Qt5Gui-platform-eglfs-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQt5EglDeviceIntegration.so
+%{_libdir}/libQt5EglDeviceIntegration.prl
+%{_pkgconfigdir}/Qt5EglDeviceIntegration.pc
+%{qt5dir}/mkspecs/modules/qt_lib_eglfs_device_lib_private.pri
+
+%if %{with kms}
+%files -n Qt5Gui-platform-eglfs-kms
+%defattr(644,root,root,755)
+# R: gl egl libdrm libgbm udev
+%attr(755,root,root) %{qt5dir}/plugins/egldeviceintegrations/libqeglfs-kms-integration.so
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSKmsIntegrationPlugin.cmake
 %endif
 
+%files -n Qt5Gui-platform-eglfs-x11
+%defattr(644,root,root,755)
+# R: libX11 libxcb
+%attr(755,root,root) %{qt5dir}/plugins/egldeviceintegrations/libqeglfs-x11-integration.so
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QEglFSX11IntegrationPlugin.cmake
+
+%files -n Qt5Gui-platform-xcb
+%defattr(644,root,root,755)
+# R: Qt5DBus xorg* xcb* libxkbcommon-x11 fontconfig freetype
+%attr(755,root,root) %{_libdir}/libQt5XcbQpa.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQt5XcbQpa.so.5
+# R: Qt5DBus xcb-* xorg*
+%attr(755,root,root) %{qt5dir}/plugins/platforms/libqxcb.so
+# loaded from src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.cpp
+%dir %{qt5dir}/plugins/xcbglintegrations
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
+
+%files -n Qt5Gui-platform-xcb-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQt5XcbQpa.so
+%{_libdir}/libQt5XcbQpa.prl
+%{_pkgconfigdir}/Qt5XcbQpa.pc
+%{qt5dir}/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri
+
+%files -n Qt5Gui-platform-xcb-egl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{qt5dir}/plugins/xcbglintegrations/libqxcb-egl-integration.so
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
+
+%files -n Qt5Gui-platform-xcb-glx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{qt5dir}/plugins/xcbglintegrations/libqxcb-glx-integration.so
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
+
 %if %{with gtk}
 %files -n Qt5Gui-platformtheme-gtk2
 %defattr(644,root,root,755)
@@ -1235,6 +1421,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libQt5Gui.so
 %{_libdir}/libQt5Gui.prl
 %{_includedir}/qt5/QtGui
+%{_includedir}/qt5/QtPlatformHeaders
 %{_pkgconfigdir}/Qt5Gui.pc
 %{_libdir}/cmake/Qt5Gui/Qt5GuiConfig*.cmake
 %{_libdir}/cmake/Qt5Gui/Qt5Gui_QEvdevKeyboardPlugin.cmake
@@ -1249,7 +1436,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cmake/Qt5Gui/Qt5Gui_QLinuxFbIntegrationPlugin.cmake
 %{_libdir}/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
 %{_libdir}/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
-%{_libdir}/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
 %{qt5dir}/mkspecs/modules/qt_lib_gui.pri
 %{qt5dir}/mkspecs/modules/qt_lib_gui_private.pri
 
@@ -1448,8 +1634,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQt5Widgets.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQt5Widgets.so.5
-# Qt5Gui plugin which requires Qt5Widgets
-%attr(755,root,root) %{qt5dir}/plugins/accessible/libqtaccessiblewidgets.so
 
 %files -n Qt5Widgets-devel
 %defattr(644,root,root,755)
@@ -1460,7 +1644,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/cmake/Qt5Widgets
 %{_libdir}/cmake/Qt5Widgets/Qt5WidgetsConfig*.cmake
 %{_libdir}/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake
-%{_libdir}/cmake/Qt5Widgets/Qt5Widgets_AccessibleFactory.cmake
 %{qt5dir}/mkspecs/modules/qt_lib_widgets.pri
 %{qt5dir}/mkspecs/modules/qt_lib_widgets_private.pri
 
@@ -1494,6 +1677,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
@@ -1511,6 +1695,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
@@ -1525,7 +1710,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n qt5-build
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/findtr-qt5
 %attr(755,root,root) %{_bindir}/moc-qt5
 %attr(755,root,root) %{_bindir}/qdbuscpp2xml-qt5
 %attr(755,root,root) %{_bindir}/qdbusxml2cpp-qt5
@@ -1533,7 +1717,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/qlalr-qt5
 %attr(755,root,root) %{_bindir}/rcc-qt5
 %attr(755,root,root) %{_bindir}/uic-qt5
-%attr(755,root,root) %{qt5dir}/bin/findtr
 %attr(755,root,root) %{qt5dir}/bin/moc
 %attr(755,root,root) %{qt5dir}/bin/qdbuscpp2xml
 %attr(755,root,root) %{qt5dir}/bin/qdbusxml2cpp
@@ -1556,6 +1739,7 @@ rm -rf $RPM_BUILD_ROOT
 %{qt5dir}/mkspecs/devices
 %{qt5dir}/mkspecs/features
 %{qt5dir}/mkspecs/freebsd-*
+%{qt5dir}/mkspecs/haiku-*
 %{qt5dir}/mkspecs/hpux-*
 %{qt5dir}/mkspecs/hpuxi-*
 %{qt5dir}/mkspecs/hurd-*
@@ -1574,6 +1758,7 @@ rm -rf $RPM_BUILD_ROOT
 %{qt5dir}/mkspecs/win32-*
 %{qt5dir}/mkspecs/wince60standard-*
 %{qt5dir}/mkspecs/wince70embedded-*
+%{qt5dir}/mkspecs/wince80colibri-*
 %{qt5dir}/mkspecs/winphone-*
 %{qt5dir}/mkspecs/winrt-*
 %{qt5dir}/mkspecs/*.pri