From e114317dbbdc634ba5700e4a37ba37fecb7fff45 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 21:51:38 +0000 Subject: [PATCH 1/7] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index c99ad82..43280f4 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.2 -Release: 1%{?dist} +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -204,6 +204,9 @@ popd %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 5.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Jun 03 2015 Jan Grulich - 5.4.2-1 - 5.4.2 From 5ec8cad9a3767578c41beb546d651cc4295cdc5a Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 29 Jun 2015 18:05:11 -0300 Subject: [PATCH 2/7] - Update rc1 5.5.0 --- .gitignore | 1 + qt5-qtwebkit.spec | 26 +++++++++++--------------- sources | 2 +- 3 files changed, 13 insertions(+), 16 deletions(-) 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 From ccc6c0f297f0eac3dca651898aa34aeb19174853 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Wed, 1 Jul 2015 11:46:26 -0300 Subject: [PATCH 3/7] - New final upstream release Qt 5.5.0 --- qt5-qtwebkit.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index dc6206e..cacd966 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -11,18 +11,18 @@ %define docs 0 %endif -%define prerelease rc +#define prerelease rc Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.5.0 -Release: 0.2.rc%{?dist} +Release: 1%{?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://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 +Source0: http://download.qt.io/official_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 From cd8caaa8794010ca9958510fdb64d9799ebcb767 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Wed, 1 Jul 2015 13:10:32 -0300 Subject: [PATCH 4/7] - Missing proper sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3bf7dd7..4f0e516 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /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 +/qtwebkit-opensource-src-5.5.0.tar.xz diff --git a/sources b/sources index 2de698e..217503f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -170e79f831c6b1f1c46ef815e0f0ebd5 qtwebkit-opensource-src-5.5.0-rc.tar.xz +5335fe211f5c0f92a4f6ca370fa9a0ce qtwebkit-opensource-src-5.5.0.tar.xz From 1afcd29b87b6f6c5201806e743ca97d8eca1e90a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 13 Jul 2015 21:17:43 -0500 Subject: [PATCH 5/7] 5.5.0-2 - add 5.5.0-1 changelog - BR: qt5-qtwebchannel-devel - (re)enable docs --- qt5-qtwebkit.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index cacd966..78b6281 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -7,8 +7,7 @@ # 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 0 +%define docs 1 %endif #define prerelease rc @@ -16,7 +15,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.5.0 -Release: 1%{?dist} +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -55,6 +54,7 @@ BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel >= %{version} BuildRequires: qt5-qtlocation-devel BuildRequires: qt5-qtsensors-devel +BuildRequires: qt5-qtwebchannel BuildRequires: bison BuildRequires: flex @@ -200,6 +200,14 @@ popd %changelog +* Mon Jul 13 2015 Rex Dieter - 5.5.0-2 +- add 5.5.0-1 changelog +- BR: qt5-qtwebchannel-devel +- (re)enable docs + +* Wed Jul 1 2015 Helio Chissini de Castro - 5.5.0-1 +- New final upstream release Qt 5.5.0 + * Thu Jun 25 2015 Helio Chissini de Castro - 5.5.0-0.2.rc - Update for official RC1 released packages From e82025a33ce69c7ac237ad5dfaf73977044e9592 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 16 Jul 2015 12:02:31 -0500 Subject: [PATCH 6/7] tighten deps (#1233829) --- qt5-qtwebkit.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 78b6281..c2ecd86 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.5.0 -Release: 2%{?dist} +Release: 3%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -83,7 +83,8 @@ BuildRequires: perl perl(version) perl(Digest::MD5) perl(Text::ParseWords) BuildRequires: ruby BuildRequires: zlib-devel -%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} +%{?_qt5:Requires: qt5-qtdeclarative%{?_isa} = %{_qt5_version}} ##upstream patches @@ -200,6 +201,9 @@ popd %changelog +* Thu Jul 16 2015 Rex Dieter 5.5.0-3 +- tighten deps (#1233829) + * Mon Jul 13 2015 Rex Dieter - 5.5.0-2 - add 5.5.0-1 changelog - BR: qt5-qtwebchannel-devel From d854d862a5eca07c8830c3d14d720f99e73dc48e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 29 Jul 2015 11:33:45 -0500 Subject: [PATCH 7/7] docs: BuildRequires: qt5-qhelpgenerator, standardize bootstrapping --- qt5-qtwebkit.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index c2ecd86..57476e6 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -6,16 +6,20 @@ # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available # only primary archs (for now), allow secondary to bootstrap +#global bootstrap 1 + +%if ! 0%{?bootstrap} %ifarch %{arm} %{ix86} x86_64 %define docs 1 %endif +%endif #define prerelease rc Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.5.0 -Release: 3%{?dist} +Release: 4%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -103,8 +107,7 @@ Requires: qt5-qtdeclarative-devel%{?_isa} %if 0%{?docs} %package doc Summary: API documentation for %{name} -# for qhelpgenerator -BuildRequires: qt5-qttools-devel +BuildRequires: qt5-qhelpgenerator BuildArch: noarch %description doc %{summary}. @@ -201,6 +204,9 @@ popd %changelog +* Wed Jul 29 2015 Rex Dieter 5.5.0-4 +- -docs: BuildRequires: qt5-qhelpgenerator, standardize bootstrapping + * Thu Jul 16 2015 Rex Dieter 5.5.0-3 - tighten deps (#1233829)