From 6dca7f32ab46b5b01e7385fce163cf5e3d0a3467 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 7 Dec 2015 10:27:50 +0100 Subject: [PATCH 1/2] 5.6.0 (sync with qt5 copr) --- .gitignore | 1 + qt5-qtscript.spec | 19 +++++++------------ sources | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index e61d51a..e8ea077 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /qtscript-opensource-src-5.5.0.tar.xz /qtscript-opensource-src-5.5.1-rc1.tar.xz /qtscript-opensource-src-5.5.1.tar.xz +/qtscript-opensource-src-5.6.0-beta1.tar.xz diff --git a/qt5-qtscript.spec b/qt5-qtscript.spec index cd6cf63..2cc8f24 100644 --- a/qt5-qtscript.spec +++ b/qt5-qtscript.spec @@ -1,23 +1,14 @@ %global qt_module qtscript -# 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 rc1 +%define prerelease beta1 Summary: Qt5 - QtScript component Name: qt5-%{qt_module} -Version: 5.5.1 -Release: 2%{?dist} +Version: 5.6.0 +Release: 0.1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -28,6 +19,7 @@ Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease: Patch0: qtscript-opensource-src-5.5.0-s390.patch BuildRequires: qt5-qtbase-devel >= %{version} +BuildRequires: qt5-qdoc BuildRequires: pkgconfig(Qt5UiTools) %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} @@ -133,6 +125,9 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la %changelog +* 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 503d15c..997c1d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7abbe43ec935004a9312387b4aa6b07f qtscript-opensource-src-5.5.1.tar.xz +d49e0b0151802ecc68e3eebbb6f39c56 qtscript-opensource-src-5.6.0-beta1.tar.xz From 97c0d990280cede7801671aa2397119e7d8dd9dd Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 7 Dec 2015 05:45:04 -0600 Subject: [PATCH 2/2] (re)add bootstrap macro support --- qt5-qtscript.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/qt5-qtscript.spec b/qt5-qtscript.spec index 2cc8f24..7591c8f 100644 --- a/qt5-qtscript.spec +++ b/qt5-qtscript.spec @@ -1,14 +1,23 @@ %global qt_module qtscript +# 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 beta1 Summary: Qt5 - QtScript component Name: qt5-%{qt_module} Version: 5.6.0 -Release: 0.1%{?dist} +Release: 0.2%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -19,7 +28,6 @@ Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease: Patch0: qtscript-opensource-src-5.5.0-s390.patch BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: qt5-qdoc BuildRequires: pkgconfig(Qt5UiTools) %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} @@ -38,6 +46,7 @@ Requires: qt5-qtbase-devel%{?_isa} %package doc Summary: API documentation for %{name} Requires: %{name} = %{version}-%{release} +BuildRequires: qt5-qdoc BuildRequires: qt5-qhelpgenerator BuildArch: noarch %description doc @@ -125,6 +134,9 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la %changelog +* Mon Dec 07 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