- updated files and build deps

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

diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index 1399620178dbf4c3de45ea0db86461e37f85ad8d..eb85509f498583c8a521fa3c811bb09b2236dbef 100644 (file)
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -26,12 +26,14 @@
 Summary:       The Qt5 WebKit libraries
 Summary(pl.UTF-8):     Biblioteki Qt5 WebKit
 Name:          qt5-%{orgname}
-Version:       5.5.1
-Release:       5
+Version:       5.8.0
+Release:       0.1
 License:       LGPL v2+
 Group:         X11/Libraries
-Source0:       http://download.qt.io/official_releases/qt/5.5/%{version}/submodules/%{orgname}-opensource-src-%{version}.tar.xz
-# Source0-md5: 681328edb539b8fa3a273b38c90b3e31
+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}
@@ -70,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
@@ -169,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 \
@@ -216,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