From 4d2e659f10f8a170d30580f754f49cf68e1e9981 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 28 Oct 2015 14:08:47 +0100 Subject: [PATCH 01/17] rebuild for ICU 56.1 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 151493e..7a82725 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.5.1 -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 @@ -184,6 +184,9 @@ popd %changelog +* Wed Oct 28 2015 David Tardon - 5.5.1-4 +- rebuild for ICU 56.1 + * Fri Oct 16 2015 Rex Dieter 5.5.1-3 - drop (unused) system_angle support/patches From d63219812be5d496beb14ad38583e1506bed0282 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 6 Dec 2015 16:25:51 -0600 Subject: [PATCH 02/17] 5.6.0 (sync with qt5 copr), re-add bootstrap macro support --- .gitignore | 7 +------ qt5-qtwebkit.spec | 24 +++++++++++++++--------- sources | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index d818f91..cdd7ca0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,2 @@ -/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 -/qtwebkit-opensource-src-5.5.0.tar.xz -/qtwebkit-opensource-src-5.5.1-rc1.tar.xz /qtwebkit-opensource-src-5.5.1.tar.xz +/qtwebkit-opensource-src-5.6.0-beta1.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 7a82725..4f86188 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -6,7 +6,7 @@ # 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 +%global bootstrap 1 %if ! 0%{?bootstrap} %ifarch %{arm} %{ix86} x86_64 @@ -14,12 +14,12 @@ %endif %endif -## define prerelease rc1 +%define prerelease beta1 Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.5.1 -Release: 4%{?dist} +Version: 5.6.0 +Release: 0.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 @@ -43,11 +43,10 @@ Patch7: 0001-Add-ARM-64-support.patch Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: qt5-qtdeclarative-devel >= %{version} -BuildRequires: qt5-qtlocation-devel -BuildRequires: qt5-qtsensors-devel -BuildRequires: qt5-qtwebchannel - +BuildRequires: pkgconfig(Qt5Qml) >= %{version} +BuildRequires: pkgconfig(Qt5Sensors) +BuildRequires: pkgconfig(Qt5Location) +BuildRequires: pkgconfig(Qt5WebChannel) BuildRequires: bison BuildRequires: flex BuildRequires: gperf @@ -96,6 +95,7 @@ Requires: qt5-qtdeclarative-devel%{?_isa} %if 0%{?docs} %package doc Summary: API documentation for %{name} +BuildRequires: qt5-qdoc BuildRequires: qt5-qhelpgenerator BuildArch: noarch %description doc @@ -184,6 +184,12 @@ popd %changelog +* Sun Dec 06 2015 Rex Dieter 5.6.0-0.2 +- (re)add bootstrap macro support + +* Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 +- Start to implement 5.6.0 beta + * Wed Oct 28 2015 David Tardon - 5.5.1-4 - rebuild for ICU 56.1 diff --git a/sources b/sources index c3c4633..e6c50bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -681328edb539b8fa3a273b38c90b3e31 qtwebkit-opensource-src-5.5.1.tar.xz +7f06fdbf4fd1eff94c1c85068c155c1c qtwebkit-opensource-src-5.6.0-beta1.tar.xz From 78da47ae310e6a526442b314ee224ad44fbd9991 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 6 Dec 2015 19:40:56 -0600 Subject: [PATCH 03/17] new-sources (for real this time) --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index e6c50bd..f0e6f07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f06fdbf4fd1eff94c1c85068c155c1c qtwebkit-opensource-src-5.6.0-beta1.tar.xz +cce8bfe12016c85313c0087a280a6d2f qtwebkit-opensource-src-5.6.0-beta1.tar.xz From 7b975f156ef68d6a0513077dcbd75325bab90fe2 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Thu, 10 Dec 2015 21:40:15 +0100 Subject: [PATCH 04/17] - Update to final official beta --- .gitignore | 1 + qt5-qtwebkit.spec | 44 ++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index d818f91..31cb1bd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /qtwebkit-opensource-src-5.5.0.tar.xz /qtwebkit-opensource-src-5.5.1-rc1.tar.xz /qtwebkit-opensource-src-5.5.1.tar.xz +/qtwebkit-opensource-src-5.6.0-beta.tar.gz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 8495a2b..a4a5ed8 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -3,29 +3,26 @@ %global _hardened_build 1 -# 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 +%define prerelease beta -%if ! 0%{?bootstrap} -%ifarch %{arm} %{ix86} x86_64 %define docs 1 -%endif -%endif - -## define prerelease rc1 Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.5.1 -Release: 2%{?dist} +Version: 5.6.0 +Release: 0.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 License: LGPLv2 with exceptions or GPLv3 with exceptions -Url: http://www.qt.io -Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz +Url: http://www.qt.io +# The source for this package was pulled from upstream's vcs. Use the +# following commands to generate the tarball: +# git clone git@github.com:qtproject/qtwebkit.git && cd qtwebkit +# git archive --prefix=qt5-qtwebkit-opensource-src-5.6.0-beta/ origin/5.6 | tar -x -C .. +# cd ../qt5-qtwebkit-opensource-src-5.6.0-beta && syncqt.pl -version 5.6.0 && cd .. +# tar cfz qt5-qtwebkit-opensource-src-5.6.0-beta.tar.gz qt5-qtwebkit-opensource-src-5.6.0-beta +Source0: %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.gz # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -51,15 +48,16 @@ Patch7: 0001-Add-ARM-64-support.patch Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch %if 0%{?system_angle} -BuildRequires: angleproject-devel angleproject-static +BuildRequires: angleproject-devel +BuildRequires: angleproject-static %endif BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: qt5-qtdeclarative-devel >= %{version} -BuildRequires: qt5-qtlocation-devel -BuildRequires: qt5-qtsensors-devel -BuildRequires: qt5-qtwebchannel - +BuildRequires: pkgconfig(Qt5Qml) >= %{version} +BuildRequires: pkgconfig(Qt5Sensors) +BuildRequires: pkgconfig(Qt5Location) +BuildRequires: pkgconfig(Qt5WebChannel) +BuildRequires: qt5-qdoc BuildRequires: bison BuildRequires: flex BuildRequires: gperf @@ -205,6 +203,12 @@ popd %changelog +* Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.2 +- Official beta release + +* Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 +- Start to implement 5.6.0 beta + * Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 - Update to final release 5.5.1 diff --git a/sources b/sources index c3c4633..ef5a009 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -681328edb539b8fa3a273b38c90b3e31 qtwebkit-opensource-src-5.5.1.tar.xz +7935d48b6c312d2e3cee84c51bb30772 qtwebkit-opensource-src-5.6.0-beta.tar.gz From 003e1cc7c38d5a9da75cc55f6264b5d345dc93b8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 11 Dec 2015 12:12:46 -0600 Subject: [PATCH 05/17] 5.6.0-0.4 - restore bootstrap macro - drop (unused) system_angle support - include -qdoc builddep only in -doc subpkg --- qt5-qtwebkit.spec | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 84736b2..6b9b623 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -3,19 +3,23 @@ %global _hardened_build 1 +%global bootstrap 1 + # 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 beta -%define docs 1 - Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.3%{?dist} +Release: 0.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 @@ -44,16 +48,13 @@ Patch7: 0001-Add-ARM-64-support.patch # truly madly deeply no rpath please, kthxbye Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch -%if 0%{?system_angle} -BuildRequires: angleproject-devel -BuildRequires: angleproject-static -%endif BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: pkgconfig(Qt5Qml) >= %{version} +%if ! 0%{?bootstrap} BuildRequires: pkgconfig(Qt5Sensors) BuildRequires: pkgconfig(Qt5Location) BuildRequires: pkgconfig(Qt5WebChannel) -BuildRequires: qt5-qdoc +%endif BuildRequires: bison BuildRequires: flex BuildRequires: gperf @@ -191,6 +192,11 @@ popd %changelog +* Fri Dec 11 2015 Rex Dieter - 5.6.0-0.4 +- restore bootstrap macro, omit more optional BR's/features in bootstrap mode +- drop (unused) system_angle support +- include -qdoc builddep only in -doc subpkg + * Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.3 - Official beta release From 2e584ef9ae29583cc9c7401993417427741af4e1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 11 Dec 2015 13:09:31 -0600 Subject: [PATCH 06/17] remove bootstrap inadvertantly left on during local testing --- qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 6b9b623..7949250 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -3,7 +3,7 @@ %global _hardened_build 1 -%global bootstrap 1 +#global bootstrap 1 # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available From eeae85600fc306af9c5a2f8fa05257c64b18c9f1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 11 Dec 2015 21:57:34 -0600 Subject: [PATCH 07/17] fix FTBFS, missing include/ (and syncqt.pl) --- qt5-qtwebkit.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 7949250..fb4e6ca 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -126,6 +126,11 @@ mkdir Source/ThirdParty/orig mv Source/ThirdParty/{gtest/,qunit/} \ Source/ThirdParty/orig/ +# check for prerelease macro instead? --rex +if [ ! -d include ]; then +syncqt.pl -version %{version} Source/sync.profile +fi + %build mkdir %{_target_platform} From 5c9fd784a46c31daf06f171e7f54839918df81d6 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Sun, 13 Dec 2015 17:57:55 +0100 Subject: [PATCH 08/17] - Definitive source. Remember: DEPRECATED --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index ef5a009..41c4039 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7935d48b6c312d2e3cee84c51bb30772 qtwebkit-opensource-src-5.6.0-beta.tar.gz +29d31fafed9210fd7ce7770523182b60 qtwebkit-opensource-src-5.6.0-beta.tar.gz From 7a4ad93e1a3d929561695faea544712480246931 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Sun, 13 Dec 2015 17:59:21 +0100 Subject: [PATCH 09/17] - Definitive source. Remember: DEPRECATED --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index fb4e6ca..2b869bc 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.4%{?dist} +Release: 0.5%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -197,6 +197,9 @@ popd %changelog +* Sun Dec 13 2015 Helio Chissini de Castro - 5.6.0-0.5 +- Update beta code + * Fri Dec 11 2015 Rex Dieter - 5.6.0-0.4 - restore bootstrap macro, omit more optional BR's/features in bootstrap mode - drop (unused) system_angle support From b2ca620ad8c1d5c8353e850fb772bb70e8b0b960 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Dec 2015 16:02:36 +0100 Subject: [PATCH 10/17] Rebuilt for libwebp soname bump Signed-off-by: Igor Gnatenko --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 2b869bc..33b9ecc 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.5%{?dist} +Release: 0.6%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -197,6 +197,9 @@ popd %changelog +* Mon Dec 28 2015 Igor Gnatenko - 5.6.0-0.6 +- Rebuilt for libwebp soname bump + * Sun Dec 13 2015 Helio Chissini de Castro - 5.6.0-0.5 - Update beta code From dfc1b20c1df2ad64290ba63a09783de4cbef0bab Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 28 Dec 2015 23:24:17 -0600 Subject: [PATCH 11/17] BR: cmake, use %license --- qt5-qtwebkit.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 33b9ecc..59e3c16 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.6%{?dist} +Release: 0.7%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -48,6 +48,7 @@ Patch7: 0001-Add-ARM-64-support.patch # truly madly deeply no rpath please, kthxbye Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch +BuildRequires: cmake BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: pkgconfig(Qt5Qml) >= %{version} %if ! 0%{?bootstrap} @@ -173,7 +174,7 @@ popd %postun -p /sbin/ldconfig %files -%doc Source/WebCore/LICENSE* +%license Source/WebCore/LICENSE* %doc ChangeLog* VERSION %{_qt5_libdir}/libQt5WebKit.so.5* %{_qt5_libdir}/libQt5WebKitWidgets.so.5* @@ -197,6 +198,9 @@ popd %changelog +* Mon Dec 28 2015 Rex Dieter 5.6.0-0.7 +- BR: cmake, use %%license + * Mon Dec 28 2015 Igor Gnatenko - 5.6.0-0.6 - Rebuilt for libwebp soname bump From 99123cf4d8fb54120339a3d5bac5bc8836274530 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 21:48:08 +0000 Subject: [PATCH 12/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 59e3c16..e8207af 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.7%{?dist} +Release: 0.8%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -198,6 +198,9 @@ popd %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 5.6.0-0.8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Dec 28 2015 Rex Dieter 5.6.0-0.7 - BR: cmake, use %%license From edbc96a45bf58d6a679d212f520f45d39a8060ab Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 15 Feb 2016 17:51:57 +0100 Subject: [PATCH 13/17] Update rc release --- .gitignore | 1 + qt5-qtwebkit.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bd86134..3acd1b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /qtwebkit-opensource-src-5.5.1.tar.xz /qtwebkit-opensource-src-5.6.0-beta.tar.gz /qtwebkit-opensource-src-5.6.0-beta1.tar.xz +/qtwebkit-opensource-src-5.6.0-rc.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index e8207af..b1bc978 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -14,12 +14,12 @@ %endif %endif -%define prerelease beta +%define prerelease rc Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.8%{?dist} +Release: 0.9%{?dist}.%{prerelease}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -30,8 +30,8 @@ Url: http://www.qt.io # git clone git@github.com:qtproject/qtwebkit.git && cd qtwebkit # git archive --prefix=qt5-qtwebkit-opensource-src-5.6.0-beta/ origin/5.6 | tar -x -C .. # cd ../qt5-qtwebkit-opensource-src-5.6.0-beta && syncqt.pl -version 5.6.0 && cd .. -# tar cfz qt5-qtwebkit-opensource-src-5.6.0-beta.tar.gz qt5-qtwebkit-opensource-src-5.6.0-beta -Source0: %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.gz +# tar cfz qt5-qtwebkit-opensource-src-5.6.0-beta.tar.xz qt5-qtwebkit-opensource-src-5.6.0-beta +Source0: %{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 @@ -198,6 +198,9 @@ popd %changelog +* Mon Feb 15 2016 Helio Chissini de Castro - 5.6.0-0.9 +- Update RC release + * Thu Feb 04 2016 Fedora Release Engineering - 5.6.0-0.8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 41c4039..020d63b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29d31fafed9210fd7ce7770523182b60 qtwebkit-opensource-src-5.6.0-beta.tar.gz +7a65d9aa88394b6bde8e435dcd403250 qtwebkit-opensource-src-5.6.0-rc.tar.xz From d4131255a00a90345ed0c65390a4f5cedbcca3e9 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Tue, 23 Feb 2016 16:45:12 +0100 Subject: [PATCH 14/17] Update final RC --- .gitignore | 1 + qt5-qtwebkit.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3acd1b7..1c9ffbb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /qtwebkit-opensource-src-5.6.0-beta.tar.gz /qtwebkit-opensource-src-5.6.0-beta1.tar.xz /qtwebkit-opensource-src-5.6.0-rc.tar.xz +/qtwebkit-opensource-src-5.6.0.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index b1bc978..2bb64ea 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.9%{?dist}.%{prerelease}%{?dist} +Release: 0.10%{?dist}.%{prerelease}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -198,6 +198,9 @@ popd %changelog +* Tue Feb 23 2016 Helio Chissini de Castro - 5.6.0-0.10.rc +- Update to final RC + * Mon Feb 15 2016 Helio Chissini de Castro - 5.6.0-0.9 - Update RC release diff --git a/sources b/sources index 020d63b..aa3fff0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a65d9aa88394b6bde8e435dcd403250 qtwebkit-opensource-src-5.6.0-rc.tar.xz +f93c15d465a12c4598851ab8319be90d qtwebkit-opensource-src-5.6.0.tar.xz From b75f51ece7b28a7e0b5e143569824c3bc142aaf7 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Wed, 24 Feb 2016 17:01:49 +0100 Subject: [PATCH 15/17] - Fix release --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 2bb64ea..30736ca 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.10%{?dist}.%{prerelease}%{?dist} +Release: 0.11.%{prerelease}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -198,6 +198,9 @@ popd %changelog +* Wed Feb 24 2016 Helio Chissini de Castro - 5.6.0-0.11.rc +- Fix the trap caused by rpmdev-bumpspec + * Tue Feb 23 2016 Helio Chissini de Castro - 5.6.0-0.10.rc - Update to final RC From 5e5fe447016b3d8cb7fe42993d597ff8a6044d8e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 29 Feb 2016 08:01:43 -0600 Subject: [PATCH 16/17] fix sources --- .gitignore | 3 --- qt5-qtwebkit.spec | 14 +++++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1c9ffbb..d32b50a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ /qtwebkit-opensource-src-5.5.1.tar.xz -/qtwebkit-opensource-src-5.6.0-beta.tar.gz -/qtwebkit-opensource-src-5.6.0-beta1.tar.xz -/qtwebkit-opensource-src-5.6.0-rc.tar.xz /qtwebkit-opensource-src-5.6.0.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 30736ca..31e5137 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.11.%{prerelease}%{?dist} +Release: 0.12.%{prerelease}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -31,7 +31,12 @@ Url: http://www.qt.io # git archive --prefix=qt5-qtwebkit-opensource-src-5.6.0-beta/ origin/5.6 | tar -x -C .. # cd ../qt5-qtwebkit-opensource-src-5.6.0-beta && syncqt.pl -version 5.6.0 && cd .. # tar cfz qt5-qtwebkit-opensource-src-5.6.0-beta.tar.xz qt5-qtwebkit-opensource-src-5.6.0-beta -Source0: %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz + +%if 0%{?prerelease:1} +Source0: http://download.qt.io/development_releases/qt/5.6/%{version}-%{prerelease}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +%else +Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +%endif # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -113,7 +118,7 @@ BuildArch: noarch %prep -%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} +%setup -q -n %{qt_module}-opensource-src-%{version} %patch1 -p1 -b .pluginpath %patch3 -p1 -b .debuginfo @@ -198,6 +203,9 @@ popd %changelog +* Mon Feb 29 2016 Rex Dieter 5.6.0-0.12.rc +- fix sources + * Wed Feb 24 2016 Helio Chissini de Castro - 5.6.0-0.11.rc - Fix the trap caused by rpmdev-bumpspec From 1d5f93ff8f79a2f15bd7f209c2834cce1bb81826 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 14 Mar 2016 17:52:52 +0100 Subject: [PATCH 17/17] - 5.6.0 release --- qt5-qtwebkit.spec | 20 ++++++-------------- sources | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 31e5137..bf0315c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -14,29 +14,18 @@ %endif %endif -%define prerelease rc +#define prerelease Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.12.%{prerelease}%{?dist} +Release: 1%{?prerelease:.%{prerelease}}%{?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 -# The source for this package was pulled from upstream's vcs. Use the -# following commands to generate the tarball: -# git clone git@github.com:qtproject/qtwebkit.git && cd qtwebkit -# git archive --prefix=qt5-qtwebkit-opensource-src-5.6.0-beta/ origin/5.6 | tar -x -C .. -# cd ../qt5-qtwebkit-opensource-src-5.6.0-beta && syncqt.pl -version 5.6.0 && cd .. -# tar cfz qt5-qtwebkit-opensource-src-5.6.0-beta.tar.xz qt5-qtwebkit-opensource-src-5.6.0-beta - -%if 0%{?prerelease:1} -Source0: http://download.qt.io/development_releases/qt/5.6/%{version}-%{prerelease}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz -%else -Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz -%endif +Source0: http://download.qt.io/snapshots/qt/5.6/%{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 @@ -203,6 +192,9 @@ popd %changelog +* Mon Mar 14 2016 Helio Chissini de Castro - 5.6.0-1 +- 5.6.0 final release + * Mon Feb 29 2016 Rex Dieter 5.6.0-0.12.rc - fix sources diff --git a/sources b/sources index aa3fff0..fea13df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f93c15d465a12c4598851ab8319be90d qtwebkit-opensource-src-5.6.0.tar.xz +eba1382587add1c9b1293a532e7dd161 qtwebkit-opensource-src-5.6.0.tar.xz