X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=qt5-qtbase.spec;h=dc75f0707b938d1dc3a912b2325037448e49afad;hb=6047dfd3adce9c0db72f794b6fa002f2ce1e2684;hp=8604a6e00eb238fb1798dc42679bc12c56fc8b98;hpb=0bac8e294a4e089540db0714733c7d5b6029db8a;p=packages%2Fqt5-qtbase.git

diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 8604a6e..dc75f07 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -1,14 +1,27 @@
-# TODO:
-# - separate some plugins (SQL, DirectFB...)
-
+# 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.
+# Thus, for plugins separated into subpackages, we package plugins .cmake file
+# together with module, and the rest of .cmake files in appropriate -devel subpackage.
+#
 # 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
 # -- 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	kms		# KMS platform 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
@@ -18,9 +31,8 @@
 %bcond_without	sqlite3		# SQLite3 plugin
 %bcond_without	ibase		# ibase (InterBase/Firebird) plugin
 %bcond_with	db2		# DB2 support
-%bcond_with	oracle		# OCI (Oracle) support
+%bcond_with	oci		# OCI (Oracle) support
 # -- SIMD CPU instructions
-%bcond_with	sse		# use SSE instructions in gui/painting module
 %bcond_with	sse2		# use SSE2 instructions
 %bcond_with	sse3		# use SSE3 instructions (since: Intel middle Pentium4, AMD Athlon64)
 %bcond_with	ssse3		# use SSSE3 instructions (Intel since Core2, Via Nano)
@@ -29,70 +41,84 @@
 %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 pentium3 pentium4 %{x8664}
-%define		with_sse	1
-%endif
-%ifarch pentium4 %{x8664}
+%ifarch pentium4 %{x8664} x32
 %define		with_sse2	1
 %endif
 
-%define		icu_abi		52
+%if %{with bootstrap}
+%undefine	with_qch
+%undefine	with_qm
+%endif
+
+%define		icu_abi		55
 %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.2.0
+Version:	5.5.0
 Release:	0.1
-# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
-License:	LGPLv2 with exceptions or GPLv3 with exceptions
+# 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.2/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
-# Source0-md5:	c94bbaf1bb7f0f4a32d2caa7501416e1
+Source0:	http://download.qt-project.org/official_releases/qt/5.5/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
+# Source0-md5:	252613b5a180c94d7196d10467a4f08b
+Source1:	http://download.qt-project.org/official_releases/qt/5.5/%{version}/submodules/qttranslations-opensource-src-%{version}.tar.xz
+# Source1-md5:	423cccbace459623a9a173cede968cbe
+Patch0:		qtbase-oracle-instantclient.patch
+Patch1:		%{name}-system_cacerts.patch
 URL:		http://qt-project.org/
 %{?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}
 BuildRequires:	alsa-lib-devel
 %{?with_gtk:BuildRequires:	atk-devel}
-%{?with_cups:BuildRequires:	cups-devel}
+%{?with_cups:BuildRequires:	cups-devel >= 1.4}
 BuildRequires:	dbus-devel >= 1.2
 BuildRequires:	fontconfig-devel
 %{?with_freetds:BuildRequires:	freetds-devel}
-BuildRequires:	freetype-devel >= 1:2.0.0
+BuildRequires:	freetype-devel >= 2.1.3
 %{?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_kms:BuildRequires:	libdrm-devel}
 # see dependency on libicu version below
 BuildRequires:	libicu-devel < %{next_icu_abi}
 BuildRequires:	libicu-devel >= %{icu_abi}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 2:1.0.8
 BuildRequires:	libstdc++-devel
-BuildRequires:	libxcb-devel >= 1.5
+BuildRequires:	libxcb-devel >= 1.10
 %{?with_mysql:BuildRequires:	mysql-devel}
 BuildRequires:	openssl-devel
+%{?with_oci:BuildRequires:	oracle-instantclient-devel}
 BuildRequires:	pcre16-devel >= 8.30
 BuildRequires:	pkgconfig
 %{?with_pgsql:BuildRequires:	postgresql-backend-devel}
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	pulseaudio-devel >= 0.9.10
+%{?with_qch:BuildRequires:	qt5-assistant >= 5.2}
+%{?with_qm:BuildRequires:	qt5-linguist >= 5.2}
 BuildRequires:	rpmbuild(macros) >= 1.654
 BuildRequires:	sed >= 4.0
 %{?with_sqlite2:BuildRequires:	sqlite-devel}
 %{?with_sqlite3:BuildRequires:	sqlite3-devel}
+%{?with_systemd:BuildRequires:	systemd-devel}
 BuildRequires:	tar >= 1:1.22
 %{?with_tslib:BuildRequires:	tslib-devel}
 BuildRequires:	udev-devel
@@ -110,7 +136,8 @@ 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.2.0
+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)
@@ -134,8 +161,8 @@ Xml.
 Summary:	Qt5 Bootstrap library - development files
 Summary(pl.UTF-8):	Biblioteka Qt5 Bootstrap - pliki programistyczne
 Group:		Development/Libraries
-# for (subset of) QtCore headers
-Requires:	QtCore-devel = %{version}-%{release}
+# for (subset of) Qt5Core headers
+Requires:	Qt5Core-devel = %{version}-%{release}
 Requires:	zlib-devel
 
 %description -n Qt5Bootstrap-devel
@@ -239,6 +266,14 @@ Summary:	Qt5 Gui library
 Summary(pl.UTF-8):	Biblioteka Qt5 Gui
 Group:		Libraries
 Requires:	Qt5Core = %{version}-%{release}
+# for:
+# - ibus platforminputcontext plugin
+# - qxcb platform plugin
+Requires:	Qt5DBus = %{version}-%{release}
+# for qxcb platform plugin
+Requires:	libxcb >= 1.10
+# for compose platforminputcontext plugin
+Requires:	xorg-lib-libxkbcommon >= 0.4.1
 
 %description -n Qt5Gui
 The Qt5 GUI library provides the basic enablers for graphical
@@ -248,6 +283,66 @@ 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-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)
+Group:		Libraries
+Requires:	Qt5Gui = %{version}-%{release}
+
+%description -n Qt5Gui-generic-tslib
+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-platform-directfb
+Summary:	Qt5 Gui platform plugin for DirectFB
+Summary(pl.UTF-8):	Wtyczka platformy Qt5 Gui dla DirectFB
+Group:		Libraries
+Requires:	Qt5Gui = %{version}-%{release}
+
+%description -n Qt5Gui-platform-directfb
+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
+Group:		Libraries
+Requires:	Qt5Gui = %{version}-%{release}
+
+%description -n Qt5Gui-platform-kms
+Qt5 Gui platform plugin for KMS.
+
+%description -n Qt5Gui-platform-kms -l pl.UTF-8
+Wtyczka platformy Qt5 Gui dla KMS.
+
+%package -n Qt5Gui-platform-egl
+Summary:	Qt5 Gui platform plugins for EGL
+Summary(pl.UTF-8):	Wtyczki platform Qt5 Gui dla EGL
+Group:		Libraries
+Requires:	Qt5Gui = %{version}-%{release}
+
+%description -n Qt5Gui-platform-egl
+Qt5 Gui platform plugins for EGL.
+
+%description -n Qt5Gui-platform-egl -l pl.UTF-8
+Wtyczki platform Qt5 Gui dla EGL.
+
+%package -n Qt5Gui-platformtheme-gtk2
+Summary:	Qt5 Gui platform theme plugin for GTK+ 2.x
+Summary(pl.UTF-8):	Wtyczka motywów platform Qt5 Gui dla GTK+ 2.x
+Group:		Libraries
+Requires:	Qt5Gui = %{version}-%{release}
+
+%description -n Qt5Gui-platformtheme-gtk2
+Qt5 Gui platform theme plugin for GTK+ 2.x.
+
+%description -n Qt5Gui-platformtheme-gtk2 -l pl.UTF-8
+Wtyczka motywów platform Qt5 Gui dla GTK+ 2.x.
+
 %package -n Qt5Gui-devel
 Summary:	Qt5 Gui library - development files
 Summary(pl.UTF-8):	Biblioteka Qt5 Gui - pliki programistyczne
@@ -268,6 +363,8 @@ Summary:	Qt5 Network library
 Summary(pl.UTF-8):	Biblioteka Qt5 Network
 Group:		Libraries
 Requires:	Qt5Core = %{version}-%{release}
+# for bearer plugins (qconnman, qnm):
+Requires:	Qt5DBus = %{version}-%{release}
 
 %description -n Qt5Network
 The Qt5 Network library provides classes to make network programming
@@ -347,7 +444,7 @@ Requires:	Qt5Core-devel = %{version}-%{release}
 Requires:	Qt5DBus-devel = %{version}-%{release}
 Requires:	Qt5Gui-devel = %{version}-%{release}
 Requires:	fontconfig-devel
-Requires:	freetype-devel
+Requires:	freetype-devel >= 2.1.3
 Requires:	xorg-lib-libX11-devel
 Requires:	xorg-lib-libXrender-devel
 Requires:	xorg-lib-libXext-devel
@@ -367,6 +464,7 @@ Group:		Libraries
 Requires:	Qt5Core = %{version}-%{release}
 Requires:	Qt5Gui = %{version}-%{release}
 Requires:	Qt5Widgets = %{version}-%{release}
+%{?with_cups:Requires:	cups-lib >= 1.4}
 
 %description -n Qt5PrintSupport
 The Qt5 PrintSupport library provides classes to make printing easier
@@ -419,6 +517,116 @@ Header files for Qt5 Sql library.
 %description -n Qt5Sql-devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki Qt5 Sql.
 
+%package -n Qt5Sql-sqldriver-db2
+Summary:	Qt5 Sql driver for IBM DB2 database
+Summary(pl.UTF-8):	Sterownik Qt5 Sql dla bazy danych IBM DB2
+Group:		Libraries
+Requires:	Qt5Sql = %{version}-%{release}
+
+%description -n Qt5Sql-sqldriver-db2
+Qt5 Sql driver for IBM DB2 database.
+
+%description -n Qt5Sql-sqldriver-db2 -l pl.UTF-8
+Sterownik Qt5 Sql dla bazy danych IBM DB2.
+
+%package -n Qt5Sql-sqldriver-ibase
+Summary:	Qt5 Sql driver for Firebird/InterBase database
+Summary(pl.UTF-8):	Sterownik Qt5 Sql dla bazy danych Firebird/InterBase
+Group:		Libraries
+Requires:	Qt5Sql = %{version}-%{release}
+
+%description -n Qt5Sql-sqldriver-ibase
+Qt5 Sql driver for Firebird/InterBase database.
+
+%description -n Qt5Sql-sqldriver-ibase -l pl.UTF-8
+Sterownik Qt5 Sql dla bazy danych Firebird/InterBase.
+
+%package -n Qt5Sql-sqldriver-sqlite3
+Summary:	Qt5 Sql driver for SQLite 3.x database
+Summary(pl.UTF-8):	Sterownik Qt5 Sql dla bazy danych SQLite 3.x
+Group:		Libraries
+Requires:	Qt5Sql = %{version}-%{release}
+
+%description -n Qt5Sql-sqldriver-sqlite3
+Qt5 Sql driver for SQLite 3.x database.
+
+%description -n Qt5Sql-sqldriver-sqlite3 -l pl.UTF-8
+Sterownik Qt5 Sql dla bazy danych SQLite 3.x.
+
+%package -n Qt5Sql-sqldriver-sqlite2
+Summary:	Qt5 Sql driver for SQLite 2.x database
+Summary(pl.UTF-8):	Sterownik Qt5 Sql dla bazy danych SQLite 2.x
+Group:		Libraries
+Requires:	Qt5Sql = %{version}-%{release}
+
+%description -n Qt5Sql-sqldriver-sqlite2
+Qt5 Sql driver for SQLite 2.x database.
+
+%description -n Qt5Sql-sqldriver-sqlite2 -l pl.UTF-8
+Sterownik Qt5 Sql dla bazy danych SQLite 2.x.
+
+%package -n Qt5Sql-sqldriver-mysql
+Summary:	Qt5 Sql driver for MySQL database
+Summary(pl.UTF-8):	Sterownik Qt5 Sql dla bazy danych MySQL
+Group:		Libraries
+Requires:	Qt5Sql = %{version}-%{release}
+
+%description -n Qt5Sql-sqldriver-mysql
+Qt5 Sql driver for MySQL database.
+
+%description -n Qt5Sql-sqldriver-mysql -l pl.UTF-8
+Sterownik Qt5 Sql dla bazy danych MySQL.
+
+%package -n Qt5Sql-sqldriver-oci
+Summary:	Qt5 Sql driver for Oracle database (using OCI interface)
+Summary(pl.UTF-8):	Sterownik Qt5 Sql dla bazy danych Oracle (wykorzystujący interfejs OCI)
+Group:		Libraries
+Requires:	Qt5Sql = %{version}-%{release}
+
+%description -n Qt5Sql-sqldriver-oci
+Qt5 Sql driver for Oracle database (using OCI interface).
+
+%description -n Qt5Sql-sqldriver-oci -l pl.UTF-8
+Sterownik Qt5 Sql dla bazy danych Oracle (wykorzystujący interfejs
+OCI).
+
+%package -n Qt5Sql-sqldriver-odbc
+Summary:	Qt5 Sql driver for ODBC databases
+Summary(pl.UTF-8):	Sterownik Qt5 Sql dla baz danych ODBC
+Group:		Libraries
+Requires:	Qt5Sql = %{version}-%{release}
+
+%description -n Qt5Sql-sqldriver-odbc
+Qt5 Sql driver for ODBC databases.
+
+%description -n Qt5Sql-sqldriver-odbc -l pl.UTF-8
+Sterownik Qt5 Sql dla baz danych ODBC.
+
+%package -n Qt5Sql-sqldriver-pgsql
+Summary:	Qt5 Sql driver for PostgreSQL database
+Summary(pl.UTF-8):	Sterownik Qt5 Sql dla bazy danych PostgreSQL
+Group:		Libraries
+Requires:	Qt5Sql = %{version}-%{release}
+
+%description -n Qt5Sql-sqldriver-pgsql
+Qt5 Sql driver for PostgreSQL database.
+
+%description -n Qt5Sql-sqldriver-pgsql -l pl.UTF-8
+Sterownik Qt5 Sql dla bazy danych PostgreSQL.
+
+%package -n Qt5Sql-sqldriver-tds
+Summary:	Qt5 Sql driver for Sybase/MS SQL database (using TDS interface)
+Summary(pl.UTF-8):	Sterownik Qt5 Sql dla bazy danych Sybase/MS SQL (wykorzystujący interfejs TDS)
+Group:		Libraries
+Requires:	Qt5Sql = %{version}-%{release}
+
+%description -n Qt5Sql-sqldriver-tds
+Qt5 Sql driver for Sybase/MS SQL database (using TDS interface).
+
+%description -n Qt5Sql-sqldriver-tds -l pl.UTF-8
+Sterownik Qt5 Sql dla bazy danych Sybase/MS SQL (wykorzystujący
+interfejs TDS).
+
 %package -n Qt5Test
 Summary:	Qt5 Test library
 Summary(pl.UTF-8):	Biblioteka Qt5 Test
@@ -505,20 +713,50 @@ Header files for Qt5 Xml library.
 %description -n Qt5Xml-devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki Qt5 Xml.
 
+%package -n qt5-doc-common
+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.
+
+%description -n qt5-doc-common -l pl.UTF-8
+Część wspólna dokumentacji do Qt5 ("global", dla wszystkich
+elementów).
+
 %package doc
-Summary:	Documentation for Qt5 application framework base components
-Summary(pl.UTF-8):	Dokumentacja do podstawowych komponentów szkieletu aplikacji Qt5
+Summary:	HTML documentation for Qt5 application framework base components
+Summary(pl.UTF-8):	Dokumentacja HTML do podstawowych komponentów szkieletu aplikacji Qt5
 Group:		Documentation
-Requires:	%{name} = %{version}-%{release}
+Requires:	qt5-doc-common = %{version}-%{release}
 %if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
 %endif
 
 %description doc
-Documentation for Qt5 application framework base components.
+HTML documentation for Qt5 application framework base components.
 
 %description doc -l pl.UTF-8
-Dokumentacja do podstawowych komponentów szkieletu aplikacji Qt5.
+Dokumentacja HTML do podstawowych komponentów szkieletu aplikacji Qt5.
+
+%package doc-qch
+Summary:	QCH documentation for Qt5 application framework base components
+Summary(pl.UTF-8):	Dokumentacja QCH do podstawowych komponentów szkieletu aplikacji Qt5
+Group:		Documentation
+Requires:	qt5-doc-common = %{version}-%{release}
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description doc-qch
+QCH documentation for Qt5 application framework base components.
+
+%description doc-qch -l pl.UTF-8
+Dokumentacja QCH do podstawowych komponentów szkieletu aplikacji Qt5.
 
 %package examples
 Summary:	Examples for Qt5 application framework base components
@@ -536,9 +774,8 @@ 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
-Requires:	%{name} = %{version}-%{release}
 
 %description -n qt5-build
 This package includes the Qt resource compiler (rcc), meta objects
@@ -561,7 +798,9 @@ Qt5 makefile generator.
 Generator plików makefile dla aplikacji Qt5.
 
 %prep
-%setup -q -n %{orgname}-opensource-src-%{version}
+%setup -q -n %{orgname}-opensource-src-%{version} %{?with_qm:-a1}
+%patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/,g' mkspecs/linux-g++-64/qmake.conf
 
@@ -605,7 +844,6 @@ COMMONOPT=" \
 	-libdir %{_libdir} \
 	-plugindir %{qt5dir}/plugins \
 	-datadir %{_datadir}/qt5 \
-	-translationdir %{_localedir} \
 	-sysconfdir %{_sysconfdir}/qt5 \
 	-examplesdir %{_examplesdir}/qt5 \
 %if %{with mysql}
@@ -622,11 +860,13 @@ COMMONOPT=" \
 	-%{!?with_gtk:no-}gtkstyle \
 	-iconv \
 	-icu \
+	%{?with_systemd:-journald} \
 	-largefile \
 	-nis \
+	%{!?with_egl:-no-eglfs} \
+	%{!?with_kms:-no-kms} \
 	-no-rpath \
 	-no-separate-debug-info \
-	%{!?with_sse:-no-sse} \
 	%{!?with_sse2:-no-sse2} \
 	%{!?with_sse3:-no-sse3} \
 	%{!?with_ssse3:-no-ssse3} \
@@ -648,6 +888,7 @@ COMMONOPT=" \
 	-system-xkbcommon \
 	-system-zlib \
 	%{?with_tslib:-tslib} \
+	-%{!?with_openvg:no-}openvg \
 	-xcursor \
 	-xfixes \
 	-xinerama \
@@ -663,7 +904,7 @@ OPT=" \
 	--sql-db2=%{?with_db2:qt}%{!?with_db2:no} \
 	--sql-ibase=%{?with_ibase:qt}%{!?with_ibase:no} \
 	--sql-mysql=%{?with_mysql:qt}%{!?with_mysql:no} \
-	--sql-oci=%{?with_oracle:qt}%{!?with_oracle:no} \
+	--sql-oci=%{?with_oci:qt}%{!?with_oci:no} \
 	--sql-odbc=%{?with_odbc:qt}%{!?with_odbc:no} \
 	--sql-psql=%{?with_pgsql:qt}%{!?with_pgsql:no} \
 	--sql-sqlite2=%{?with_sqlite2:qt}%{!?with_sqlite2:no} \
@@ -686,7 +927,7 @@ OPT=" \
 	--sql-db2=%{?with_db2:plugin}%{!?with_db2:no} \
 	--sql-ibase=%{?with_ibase:plugin}%{!?with_ibase:no} \
 	--sql-mysql=%{?with_mysql:plugin}%{!?with_mysql:no} \
-	--sql-oci=%{?with_oracle:plugin}%{!?with_oracle:no} \
+	--sql-oci=%{?with_oci:plugin}%{!?with_oci:no} \
 	--sql-odbc=%{?with_odbc:plugin}%{!?with_odbc:no} \
 	--sql-psql=%{?with_pgsql:plugin}%{!?with_pgsql:no} \
 	--sql-sqlite2=%{?with_sqlite2:plugin}%{!?with_sqlite2:no} \
@@ -700,20 +941,43 @@ OPT=" \
 
 # 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
-# build only HTML docs (qch docs require qhelpgenerator)
-%{__make} html_docs
+%{__sed} -i -e 's|%{qt5dir}/bin/qdoc|LD_LIBRARY_PATH='${wd}'/lib$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} '${wd}'/bin/qdoc|' src/*/Makefile qmake/Makefile.qmake-docs
+# build only HTML docs if without qch (which require qhelpgenerator)
+%{__make} %{!?with_qch:html_}docs
+
+%if %{with qm}
+export QMAKEPATH=$(pwd)
+cd qttranslations-opensource-src-%{version}
+../bin/qmake
+%{__make}
+cd ..
+%endif
 
 %install
 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
 
-%{__make} install_html_docs \
+%{__make} install_%{!?with_qch:html_}docs \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
+%if %{with qm}
+%{__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,qtquickcontrols,qtscript,qtxmlpatterns}_*.qm
+%else
+install -d $RPM_BUILD_ROOT%{_datadir}/qt5/translations
+%endif
+
+# external plugins loaded from qtbase libs
+install -d $RPM_BUILD_ROOT%{qt5dir}/plugins/iconengines
+
 # kill unnecessary -L%{_libdir} from *.la, *.prl, *.pc
 %{__sed} -i -e "s,-L%{_libdir} \?,,g" \
 	$RPM_BUILD_ROOT%{_libdir}/*.{la,prl} \
@@ -724,11 +988,8 @@ install -d $RPM_BUILD_ROOT{/etc/qt5,%{_bindir},%{_pkgconfigdir}}
 # 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
@@ -736,14 +997,12 @@ ln -sf ../%{_lib}/qt5/bin/rcc rcc-qt5
 ln -sf ../%{_lib}/qt5/bin/qdbuscpp2xml qdbuscpp2xml-qt5
 ln -sf ../%{_lib}/qt5/bin/qdbusxml2cpp qdbusxml2cpp-qt5
 ln -sf ../%{_lib}/qt5/bin/qdoc qdoc-qt5
+ln -sf ../%{_lib}/qt5/bin/qlalr qlalr-qt5
 cd -
 
 # Prepare some files list
 ifecho() {
-	RESULT=`echo $RPM_BUILD_ROOT$2 2>/dev/null`
-	[ "$RESULT" == "" ] && return # XXX this is never true due $RPM_BUILD_ROOT being set
-	r=`echo $RESULT | awk '{ print $1 }'`
-
+	r="$RPM_BUILD_ROOT$2"
 	if [ -d "$r" ]; then
 		echo "%%dir $2" >> $1.files
 	elif [ -x "$r" ] ; then
@@ -756,12 +1015,41 @@ ifecho() {
 		return 1
 	fi
 }
+ifecho_tree() {
+	ifecho $1 $2
+	for f in `find $RPM_BUILD_ROOT$2 -printf "%%P "`; do
+		ifecho $1 $2/$f
+	done
+}
 
 echo "%defattr(644,root,root,755)" > examples.files
-ifecho examples %{_examplesdir}/qt5
-for f in `find $RPM_BUILD_ROOT%{_examplesdir}/qt5 -printf "%%P "`; do
-	ifecho examples %{_examplesdir}/qt5/$f
-done
+ifecho_tree examples %{_examplesdir}/qt5/corelib
+ifecho_tree examples %{_examplesdir}/qt5/dbus
+ifecho_tree examples %{_examplesdir}/qt5/gui
+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/touch
+ifecho_tree examples %{_examplesdir}/qt5/widgets
+ifecho_tree examples %{_examplesdir}/qt5/xml
+
+# find_lang --with-qm supports only PLD qt3/qt4 specific %{_datadir}/locale/*/LC_MESSAGES layout
+find_qt5_qm()
+{
+	name="$1"
+	find $RPM_BUILD_ROOT%{_datadir}/qt5/translations -name "${name}_*.qm" | \
+		sed -e "s:^$RPM_BUILD_ROOT::" \
+		    -e 's:\(.*/'$name'_\)\([a-z][a-z][a-z]\?\)\(_[A-Z][A-Z]\)\?\(\.qm\)$:%lang(\2\3) \1\2\3\4:'
+}
+
+echo '%defattr(644,root,root,755)' > qtbase.lang
+%if %{with qm}
+find_qt5_qm qt >> qtbase.lang
+find_qt5_qm qtbase >> qtbase.lang
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -805,6 +1093,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libQt5Bootstrap.a
 %{_libdir}/libQt5Bootstrap.prl
 %{_pkgconfigdir}/Qt5Bootstrap.pc
+%{qt5dir}/mkspecs/modules/qt_lib_bootstrap_private.pri
 
 %files -n Qt5Concurrent
 %defattr(644,root,root,755)
@@ -818,25 +1107,35 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtConcurrent
 %{_pkgconfigdir}/Qt5Concurrent.pc
 %{_libdir}/cmake/Qt5Concurrent
+%{qt5dir}/mkspecs/modules/qt_lib_concurrent.pri
+%{qt5dir}/mkspecs/modules/qt_lib_concurrent_private.pri
 
-%files -n Qt5Core
+%files -n Qt5Core -f qtbase.lang
 %defattr(644,root,root,755)
+%doc LGPL_EXCEPTION.txt header.* dist/{README,changes-*}
 %attr(755,root,root) %{_libdir}/libQt5Core.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQt5Core.so.5
 %dir /etc/qt5
 %dir %{qt5dir}
 %dir %{qt5dir}/bin
+%dir %{qt5dir}/mkspecs
+%dir %{qt5dir}/mkspecs/modules
 %dir %{qt5dir}/plugins
+%dir %{_datadir}/qt5
+%dir %{_datadir}/qt5/translations
 
 %files -n Qt5Core-devel
 %defattr(644,root,root,755)
 %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
 %{_libdir}/cmake/Qt5Core
+%{qt5dir}/mkspecs/modules/qt_lib_core.pri
+%{qt5dir}/mkspecs/modules/qt_lib_core_private.pri
 
 %files -n Qt5DBus
 %defattr(644,root,root,755)
@@ -850,15 +1149,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtDBus
 %{_pkgconfigdir}/Qt5DBus.pc
 %{_libdir}/cmake/Qt5DBus
+%{qt5dir}/mkspecs/modules/qt_lib_dbus.pri
+%{qt5dir}/mkspecs/modules/qt_lib_dbus_private.pri
 
 %files -n Qt5Gui
 %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
-# R: Qt5Widgets
-%attr(755,root,root) %{qt5dir}/plugins/accessible/libqtaccessiblewidgets.so
 # loaded from src/gui/kernel/qgenericpluginfactory.cpp
 %dir %{qt5dir}/plugins/generic
 # R: udev-libs (by all qevdev* plugins)
@@ -866,10 +1163,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{qt5dir}/plugins/generic/libqevdevmouseplugin.so
 %attr(755,root,root) %{qt5dir}/plugins/generic/libqevdevtabletplugin.so
 %attr(755,root,root) %{qt5dir}/plugins/generic/libqevdevtouchplugin.so
-%if %{with tslib}
-# R: tslib
-%attr(755,root,root) %{qt5dir}/plugins/generic/libqtslibplugin.so
-%endif
+# loaded from src/gui/image/qicon.cpp
+%dir %{qt5dir}/plugins/iconengines
 # loaded from src/gui/image/qimage{reader,writer}.cpp
 %dir %{qt5dir}/plugins/imageformats
 %attr(755,root,root) %{qt5dir}/plugins/imageformats/libqgif.so
@@ -884,17 +1179,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{qt5dir}/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
 # loaded from src/gui/kernel/qplatformintegrationfactory.cpp
 %dir %{qt5dir}/plugins/platforms
-%if %{with directfb}
-# R: DirectFB fontconfig freetype
-%attr(755,root,root) %{qt5dir}/plugins/platforms/libqdirectfb.so
-%endif
-# -kms, requires GLESv2 instead of GL
-# R: EGL GLESv2 libdrm libgbm udev-libs
-#%attr(755,root,root) %{qt5dir}/plugins/platforms/libqkms.so
-# -egl, requires GLESv2 instead of GL
-# 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
 # R: fontconfig freetype udev-libs
 %attr(755,root,root) %{qt5dir}/plugins/platforms/libqlinuxfb.so
 %attr(755,root,root) %{qt5dir}/plugins/platforms/libqminimal.so
@@ -904,9 +1188,49 @@ rm -rf $RPM_BUILD_ROOT
 %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 tslib}
+%files -n Qt5Gui-generic-tslib
+%defattr(644,root,root,755)
+# R: tslib
+%attr(755,root,root) %{qt5dir}/plugins/generic/libqtslibplugin.so
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QTsLibPlugin.cmake
+%endif
+
+%if %{with directfb}
+%files -n Qt5Gui-platform-directfb
+%defattr(644,root,root,755)
+# R: DirectFB fontconfig freetype
+%attr(755,root,root) %{qt5dir}/plugins/platforms/libqdirectfb.so
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QDirectFbIntegrationPlugin.cmake
+%endif
+
+%if %{with kms}
+%files -n Qt5Gui-platform-kms
+%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
+%endif
+
+%if %{with egl}
+%files -n Qt5Gui-platform-egl
+%defattr(644,root,root,755)
+# 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
+%endif
+
 %if %{with gtk}
+%files -n Qt5Gui-platformtheme-gtk2
+%defattr(644,root,root,755)
 # R: gtk+2
 %attr(755,root,root) %{qt5dir}/plugins/platformthemes/libqgtk2.so
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake
 %endif
 
 %files -n Qt5Gui-devel
@@ -914,8 +1238,24 @@ 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
+%{_libdir}/cmake/Qt5Gui/Qt5GuiConfig*.cmake
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QEvdevKeyboardPlugin.cmake
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QEvdevMousePlugin.cmake
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QEvdevTabletPlugin.cmake
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QEvdevTouchScreenPlugin.cmake
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake
+%{_libdir}/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
+%{_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
 
 %files -n Qt5Network
 %defattr(644,root,root,755)
@@ -935,7 +1275,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libQt5Network.prl
 %{_includedir}/qt5/QtNetwork
 %{_pkgconfigdir}/Qt5Network.pc
-%{_libdir}/cmake/Qt5Network
+%dir %{_libdir}/cmake/Qt5Network
+%{_libdir}/cmake/Qt5Network/Qt5NetworkConfig*.cmake
+%{_libdir}/cmake/Qt5Network/Qt5Network_QConnmanEnginePlugin.cmake
+%{_libdir}/cmake/Qt5Network/Qt5Network_QGenericEnginePlugin.cmake
+%{_libdir}/cmake/Qt5Network/Qt5Network_QNetworkManagerEnginePlugin.cmake
+%{qt5dir}/mkspecs/modules/qt_lib_network.pri
+%{qt5dir}/mkspecs/modules/qt_lib_network_private.pri
 
 %files -n Qt5OpenGL
 %defattr(644,root,root,755)
@@ -949,6 +1295,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtOpenGL
 %{_pkgconfigdir}/Qt5OpenGL.pc
 %{_libdir}/cmake/Qt5OpenGL
+%{qt5dir}/mkspecs/modules/qt_lib_opengl.pri
+%{qt5dir}/mkspecs/modules/qt_lib_opengl_private.pri
 
 %files -n Qt5OpenGLExtensions-devel
 %defattr(644,root,root,755)
@@ -958,6 +1306,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtOpenGLExtensions
 %{_pkgconfigdir}/Qt5OpenGLExtensions.pc
 %{_libdir}/cmake/Qt5OpenGLExtensions
+%{qt5dir}/mkspecs/modules/qt_lib_openglextensions.pri
+%{qt5dir}/mkspecs/modules/qt_lib_openglextensions_private.pri
 
 %files -n Qt5PlatformSupport-devel
 %defattr(644,root,root,755)
@@ -966,6 +1316,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libQt5PlatformSupport.prl
 %{_includedir}/qt5/QtPlatformSupport
 %{_pkgconfigdir}/Qt5PlatformSupport.pc
+%{qt5dir}/mkspecs/modules/qt_lib_platformsupport_private.pri
 
 %files -n Qt5PrintSupport
 %defattr(644,root,root,755)
@@ -983,7 +1334,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libQt5PrintSupport.prl
 %{_includedir}/qt5/QtPrintSupport
 %{_pkgconfigdir}/Qt5PrintSupport.pc
-%{_libdir}/cmake/Qt5PrintSupport
+%dir %{_libdir}/cmake/Qt5PrintSupport
+%{_libdir}/cmake/Qt5PrintSupport/Qt5PrintSupportConfig*.cmake
+%if %{with cups}
+%{_libdir}/cmake/Qt5PrintSupport/Qt5PrintSupport_QCupsPrinterSupportPlugin.cmake
+%endif
+%{qt5dir}/mkspecs/modules/qt_lib_printsupport.pri
+%{qt5dir}/mkspecs/modules/qt_lib_printsupport_private.pri
 
 %files -n Qt5Sql
 %defattr(644,root,root,755)
@@ -991,41 +1348,79 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libQt5Sql.so.5
 # loaded from src/sql/kernel/qsqldatabase.cpp
 %dir %{qt5dir}/plugins/sqldrivers
+# common for base -devel and plugin-specific files
+%dir %{_libdir}/cmake/Qt5Sql
+
 %if %{with db2}
+%files -n Qt5Sql-sqldriver-db2
+%defattr(644,root,root,755)
 # R: (proprietary) DB2 libs
 %attr(755,root,root) %{qt5dir}/plugins/sqldrivers/libqsqldb2.so
+%{_libdir}/cmake/Qt5Sql/Qt5Sql_QDB2DriverPlugin.cmake
 %endif
+
 %if %{with ibase}
+%files -n Qt5Sql-sqldriver-ibase
+%defattr(644,root,root,755)
 # R: Firebird-lib
 %attr(755,root,root) %{qt5dir}/plugins/sqldrivers/libqsqlibase.so
+%{_libdir}/cmake/Qt5Sql/Qt5Sql_QIBaseDriverPlugin.cmake
 %endif
+
 %if %{with sqlite3}
+%files -n Qt5Sql-sqldriver-sqlite3
+%defattr(644,root,root,755)
 # R: sqlite3
 %attr(755,root,root) %{qt5dir}/plugins/sqldrivers/libqsqlite.so
+%{_libdir}/cmake/Qt5Sql/Qt5Sql_QSQLiteDriverPlugin.cmake
 %endif
+
 %if %{with sqlite2}
+%files -n Qt5Sql-sqldriver-sqlite2
+%defattr(644,root,root,755)
 # R: sqlite >= 2
 %attr(755,root,root) %{qt5dir}/plugins/sqldrivers/libqsqlite2.so
+%{_libdir}/cmake/Qt5Sql/Qt5Sql_QSQLite2DriverPlugin.cmake
 %endif
+
 %if %{with mysql}
+%files -n Qt5Sql-sqldriver-mysql
+%defattr(644,root,root,755)
 # R: mysql-libs
 %attr(755,root,root) %{qt5dir}/plugins/sqldrivers/libqsqlmysql.so
+%{_libdir}/cmake/Qt5Sql/Qt5Sql_QMYSQLDriverPlugin.cmake
 %endif
-%if %{with oracle}
+
+%if %{with oci}
+%files -n Qt5Sql-sqldriver-oci
+%defattr(644,root,root,755)
 # R: (proprietary) Oracle libs
 %attr(755,root,root) %{qt5dir}/plugins/sqldrivers/libqsqloci.so
+%{_libdir}/cmake/Qt5Sql/Qt5Sql_QOCIDriverPlugin.cmake
 %endif
+
 %if %{with odbc}
+%files -n Qt5Sql-sqldriver-odbc
+%defattr(644,root,root,755)
 # R: unixODBC
 %attr(755,root,root) %{qt5dir}/plugins/sqldrivers/libqsqlodbc.so
+%{_libdir}/cmake/Qt5Sql/Qt5Sql_QODBCDriverPlugin.cmake
 %endif
+
 %if %{with pgsql}
+%files -n Qt5Sql-sqldriver-pgsql
+%defattr(644,root,root,755)
 # R: postgresql-libs
 %attr(755,root,root) %{qt5dir}/plugins/sqldrivers/libqsqlpsql.so
+%{_libdir}/cmake/Qt5Sql/Qt5Sql_QPSQLDriverPlugin.cmake
 %endif
+
 %if %{with freetds}
+%files -n Qt5Sql-sqldriver-tds
+%defattr(644,root,root,755)
 # R: freetds
 %attr(755,root,root) %{qt5dir}/plugins/sqldrivers/libqsqltds.so
+%{_libdir}/cmake/Qt5Sql/Qt5Sql_QTDSDriverPlugin.cmake
 %endif
 
 %files -n Qt5Sql-devel
@@ -1034,7 +1429,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libQt5Sql.prl
 %{_includedir}/qt5/QtSql
 %{_pkgconfigdir}/Qt5Sql.pc
-%{_libdir}/cmake/Qt5Sql
+%{_libdir}/cmake/Qt5Sql/Qt5SqlConfig*.cmake
+%{qt5dir}/mkspecs/modules/qt_lib_sql.pri
+%{qt5dir}/mkspecs/modules/qt_lib_sql_private.pri
 
 %files -n Qt5Test
 %defattr(644,root,root,755)
@@ -1048,6 +1445,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtTest
 %{_pkgconfigdir}/Qt5Test.pc
 %{_libdir}/cmake/Qt5Test
+%{qt5dir}/mkspecs/modules/qt_lib_testlib.pri
+%{qt5dir}/mkspecs/modules/qt_lib_testlib_private.pri
 
 %files -n Qt5Widgets
 %defattr(644,root,root,755)
@@ -1060,7 +1459,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libQt5Widgets.prl
 %{_includedir}/qt5/QtWidgets
 %{_pkgconfigdir}/Qt5Widgets.pc
-%{_libdir}/cmake/Qt5Widgets
+%dir %{_libdir}/cmake/Qt5Widgets
+%{_libdir}/cmake/Qt5Widgets/Qt5WidgetsConfig*.cmake
+%{_libdir}/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake
+%{qt5dir}/mkspecs/modules/qt_lib_widgets.pri
+%{qt5dir}/mkspecs/modules/qt_lib_widgets_private.pri
 
 %files -n Qt5Xml
 %defattr(644,root,root,755)
@@ -1074,27 +1477,69 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt5/QtXml
 %{_pkgconfigdir}/Qt5Xml.pc
 %{_libdir}/cmake/Qt5Xml
+%{qt5dir}/mkspecs/modules/qt_lib_xml.pri
+%{qt5dir}/mkspecs/modules/qt_lib_xml_private.pri
+
+%files -n qt5-doc-common
+%defattr(644,root,root,755)
+%dir %{_docdir}/qt5-doc
+%{_docdir}/qt5-doc/global
 
 %files doc
 %defattr(644,root,root,755)
-%{_docdir}/qt5-doc
+%{_docdir}/qt5-doc/qdoc
+%{_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
+
+%if %{with qch}
+%files doc-qch
+%defattr(644,root,root,755)
+%{_docdir}/qt5-doc/qdoc.qch
+%{_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
+%dir %{_examplesdir}/qt5
+%doc %{_examplesdir}/qt5/README
+%{_examplesdir}/qt5/examples.pro
 
 %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
 %attr(755,root,root) %{_bindir}/qdoc-qt5
+%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
 %attr(755,root,root) %{qt5dir}/bin/qdoc
+%attr(755,root,root) %{qt5dir}/bin/qlalr
 %attr(755,root,root) %{qt5dir}/bin/rcc
 %attr(755,root,root) %{qt5dir}/bin/syncqt.pl
 %attr(755,root,root) %{qt5dir}/bin/uic
@@ -1103,4 +1548,62 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qmake-qt5
 %attr(755,root,root) %{qt5dir}/bin/qmake
-%{qt5dir}/mkspecs
+%{qt5dir}/mkspecs/aix-*
+%{qt5dir}/mkspecs/android-*
+%{qt5dir}/mkspecs/blackberry-*
+%{qt5dir}/mkspecs/common
+%{qt5dir}/mkspecs/cygwin-*
+%{qt5dir}/mkspecs/darwin-*
+%{qt5dir}/mkspecs/devices
+%{qt5dir}/mkspecs/features
+%{qt5dir}/mkspecs/freebsd-*
+%{qt5dir}/mkspecs/hpux-*
+%{qt5dir}/mkspecs/hpuxi-*
+%{qt5dir}/mkspecs/hurd-*
+%{qt5dir}/mkspecs/irix-*
+%{qt5dir}/mkspecs/linux-*
+%{qt5dir}/mkspecs/lynxos-*
+%{qt5dir}/mkspecs/macx-*
+%{qt5dir}/mkspecs/netbsd-*
+%{qt5dir}/mkspecs/openbsd-*
+%{qt5dir}/mkspecs/qnx-*
+%{qt5dir}/mkspecs/sco-*
+%{qt5dir}/mkspecs/solaris-*
+%{qt5dir}/mkspecs/tru64-*
+%{qt5dir}/mkspecs/unixware-*
+%{qt5dir}/mkspecs/unsupported
+%{qt5dir}/mkspecs/win32-*
+%{qt5dir}/mkspecs/wince60standard-*
+%{qt5dir}/mkspecs/wince70embedded-*
+%{qt5dir}/mkspecs/winphone-*
+%{qt5dir}/mkspecs/winrt-*
+%{qt5dir}/mkspecs/*.pri
+
+%if 0
+# unpackaged files
+	/usr/lib64/cmake/Qt5Gui/Qt5Gui_QEglFSKmsIntegrationPlugin.cmake
+	/usr/lib64/cmake/Qt5Gui/Qt5Gui_QEglFSX11IntegrationPlugin.cmake
+	/usr/lib64/cmake/Qt5Gui/Qt5Gui_QTuioTouchPlugin.cmake
+	/usr/lib64/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
+	/usr/lib64/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
+	/usr/lib64/libQt5EglDeviceIntegration.prl
+	/usr/lib64/libQt5EglDeviceIntegration.so
+	/usr/lib64/libQt5EglDeviceIntegration.so.5
+	/usr/lib64/libQt5EglDeviceIntegration.so.5.5.0
+	/usr/lib64/libQt5XcbQpa.prl
+	/usr/lib64/libQt5XcbQpa.so
+	/usr/lib64/libQt5XcbQpa.so.5
+	/usr/lib64/libQt5XcbQpa.so.5.5.0
+	/usr/lib64/pkgconfig/Qt5EglDeviceIntegration.pc
+	/usr/lib64/pkgconfig/Qt5XcbQpa.pc
+	/usr/lib64/qt5/mkspecs/haiku-g++/qmake.conf
+	/usr/lib64/qt5/mkspecs/haiku-g++/qplatformdefs.h
+	/usr/lib64/qt5/mkspecs/modules/qt_lib_eglfs_device_lib_private.pri
+	/usr/lib64/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri
+	/usr/lib64/qt5/plugins/egldeviceintegrations/libqeglfs-kms-integration.so
+	/usr/lib64/qt5/plugins/egldeviceintegrations/libqeglfs-x11-integration.so
+	/usr/lib64/qt5/plugins/generic/libqtuiotouchplugin.so
+	/usr/lib64/qt5/plugins/xcbglintegrations/libqxcb-egl-integration.so
+	/usr/lib64/qt5/plugins/xcbglintegrations/libqxcb-glx-integration.so
+	/usr/share/qt5/translations/qtwebsockets_fr.qm
+%endif