diff --git a/.gitignore b/.gitignore index 9590011..3bf7dd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /qtwebkit-opensource-src-5.4.0.tar.xz /qtwebkit-opensource-src-5.4.1.tar.xz /qtwebkit-opensource-src-5.4.2.tar.xz +/qtwebkit-opensource-src-5.5.0-rc.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 43280f4..dc6206e 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -7,23 +7,22 @@ # where qt5-qttools builds are not yet available # only primary archs (for now), allow secondary to bootstrap %ifarch %{arm} %{ix86} x86_64 -%define docs 1 +#%define docs 1 +%define docs 0 %endif +%define prerelease rc + Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.4.2 -Release: 2%{?dist} +Version: 5.5.0 +Release: 0.2.rc%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html License: LGPLv2 with exceptions or GPLv3 with exceptions -Url: http://qt-project.org/ -%if 0%{?pre:1} -Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz -%else -Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz -%endif +Url: http://www.qt.io +Source0: http://download.qt.io/development_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -112,7 +111,7 @@ BuildArch: noarch %prep -%setup -q -n qtwebkit-opensource-src-%{version}%{?pre:-%{pre}} +%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} %patch1 -p1 -b .pluginpath %patch3 -p1 -b .debuginfo @@ -135,7 +134,6 @@ mv Source/ThirdParty/ANGLE/ \ Source/ThirdParty/orig/ %endif - %build mkdir %{_target_platform} pushd %{_target_platform} @@ -155,7 +153,6 @@ make %{?_smp_mflags} docs %endif popd - %install make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} @@ -175,7 +172,6 @@ for prl_file in libQt5*.prl ; do done popd - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -204,8 +200,8 @@ popd %changelog -* Thu Jun 18 2015 Fedora Release Engineering - 5.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Thu Jun 25 2015 Helio Chissini de Castro - 5.5.0-0.2.rc +- Update for official RC1 released packages * Wed Jun 03 2015 Jan Grulich - 5.4.2-1 - 5.4.2 diff --git a/sources b/sources index d886ed8..2de698e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b711b3f32646d72cd281b3c17ab6d14e qtwebkit-opensource-src-5.4.2.tar.xz +170e79f831c6b1f1c46ef815e0f0ebd5 qtwebkit-opensource-src-5.5.0-rc.tar.xz