From 7d85456e17a9edac864567ac1629384b20ddb440 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 6 Dec 2015 12:47:01 -0600 Subject: [PATCH] 5.6.0 (sync from qt5 copr), (re)add bootstrap macro support --- .gitignore | 1 + qt5-qtwebchannel.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a2b9dfc..ba0301c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtwebchannel-opensource-src-5.5.1.tar.xz +/qtwebchannel-opensource-src-5.6.0-beta1.tar.xz diff --git a/qt5-qtwebchannel.spec b/qt5-qtwebchannel.spec index fb14f2a..d582ac6 100644 --- a/qt5-qtwebchannel.spec +++ b/qt5-qtwebchannel.spec @@ -11,12 +11,12 @@ %endif %endif -## define prerelease rc1 +%define prerelease beta1 Summary: Qt5 - WebChannel component Name: qt5-%{qt_module} -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://doc.qt.io/qt-5/licensing.html @@ -27,8 +27,7 @@ Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease: BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Quick) - -# Qt5WebSockets package is optional and only needed for examples +# Qt5WebSockets package is optional and only needed for some examples BuildRequires: pkgconfig(Qt5WebSockets) %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} @@ -50,6 +49,7 @@ Requires: qt5-qtbase-devel%{?_isa} Summary: API documentation for %{name} License: GFDL Requires: %{name} = %{version}-%{release} +BuildRequires: qt5-qdoc BuildRequires: qt5-qhelpgenerator BuildArch: noarch %description doc @@ -66,6 +66,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} + %build mkdir %{_target_platform} pushd %{_target_platform} @@ -132,6 +133,12 @@ popd %changelog +* Sun Dec 06 2015 Rex Dieter 5.6.0-0.2 +- restore bootstrap macro support + +* 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 for final qt 5.5.1 diff --git a/sources b/sources index 5619726..1c0b1c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f2e15d52c1b7732c2afbfb7e843091cf qtwebchannel-opensource-src-5.5.1.tar.xz +e8da7c6f669054e8828947a9af924ae1 qtwebchannel-opensource-src-5.6.0-beta1.tar.xz