- updated files and build deps

[packages/qt5-qtwebkit.git] / qt5-qtwebkit.spec

diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index bc601880bb78935e363e7102012f3bf75e274cf8..eb85509f498583c8a521fa3c811bb09b2236dbef 100644 (file)
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -6,26 +6,35 @@
 # (e.g. WebProcess requires WebKitWidgets)
 #
 # Conditional build:
+%bcond_with    bootstrap       # disable features to able to build without installed qt5
+# -- build targets
 %bcond_without qch             # documentation in QCH format
+# -- features
 %bcond_with    qtmultimedia    # QtMultimedia support
 
+%if %{with bootstrap}
+%undefine      with_qch
+%endif
+
 %define                orgname                 qtwebkit
 %define                qtbase_ver              %{version}
 %define                qtdeclarative_ver       %{version}
 %define                qtlocation_ver          %{version}
 %define                qtmultimedia_ver        %{version}
 %define                qtsensors_ver           %{version}
-%define                qttools_ver             %{version}
+%define                qttools_ver             5.4
 Summary:       The Qt5 WebKit libraries
 Summary(pl.UTF-8):     Biblioteki Qt5 WebKit
 Name:          qt5-%{orgname}
-Version:       5.4.1
-Release:       1
+Version:       5.8.0
+Release:       0.1
 License:       LGPL v2+
 Group:         X11/Libraries
-Source0:       http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
-# Source0-md5: 186627b1ea5b614811fbd0cfa9b4d073
-URL:           http://qt-project.org/
+Source0:       http://download.qt.io/community_releases/5.8/%{version}-final/%{orgname}-opensource-src-%{version}.tar.xz
+# Source0-md5: 60a6935aca4a7c553d0ec4646ceed3b4
+Patch0:                icu59.patch
+Patch1:                new-char-types.patch
+URL:           http://www.qt.io/
 BuildRequires: OpenGL-devel
 BuildRequires: Qt5Core-devel >= %{qtbase_ver}
 BuildRequires: Qt5Gui-devel >= %{qtbase_ver}
@@ -63,6 +72,7 @@ BuildRequires:        xorg-lib-libXcomposite-devel
 BuildRequires: xorg-lib-libXrender-devel
 BuildRequires: xz
 BuildRequires: zlib-devel
+BuildConflicts:        leveldb-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                specflags       -fno-strict-aliasing
@@ -162,6 +172,8 @@ Dokumentacja do bibliotek Qt5 WebKit w formacie QCH.
 
 %prep
 %setup -q -n %{orgname}-opensource-src-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 qmake-qt5 \
@@ -209,7 +221,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so
 %{_libdir}/qt5/qml/QtWebKit/experimental/qmldir
 %dir %{_libdir}/qt5/libexec
-%attr(755,root,root) %{_libdir}/qt5/libexec/QtWebPluginProcess
 %attr(755,root,root) %{_libdir}/qt5/libexec/QtWebProcess
 
 %files -n Qt5WebKit-devel