From 907b9b99b6e40dc1457fef95d37c50cda39793c4 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 7 Dec 2015 12:29:23 +0100 Subject: [PATCH 1/3] Update to 5.6.0 (sync with qt5 copr) --- .gitignore | 1 + qt5-qtsvg.spec | 22 +++++++++------------- sources | 2 +- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 4dc559e..d3b3bfe 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /qtsvg-opensource-src-5.5.0.tar.xz /qtsvg-opensource-src-5.5.1-rc1.tar.xz /qtsvg-opensource-src-5.5.1.tar.xz +/qtsvg-opensource-src-5.6.0-beta1.tar.xz diff --git a/qt5-qtsvg.spec b/qt5-qtsvg.spec index 7d19c9d..76b0151 100644 --- a/qt5-qtsvg.spec +++ b/qt5-qtsvg.spec @@ -1,30 +1,23 @@ %global qt_module qtsvg -# 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 - Support for rendering and displaying SVG 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 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 +Patch0: qtsvg-opensource-src-5.6.0-beta1-example-install.patch BuildRequires: qt5-qtbase-devel >= %{version} +BuildRequires: qt5-qdoc BuildRequires: pkgconfig(zlib) %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} @@ -60,7 +53,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} - +%patch0 -p1 %build mkdir %{_target_platform} @@ -126,6 +119,9 @@ popd %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 df1d66f..cb29b87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -505fb8ba483818e53f759edbf735456e qtsvg-opensource-src-5.5.1.tar.xz +e2fd3dc6f6c5cff909ed78aeee660ba9 qtsvg-opensource-src-5.6.0-beta1.tar.xz From 4c06df8d5637c81ba11cb94d1299e3223cdf1c41 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 7 Dec 2015 12:34:48 +0100 Subject: [PATCH 2/3] Add missing patch --- qtsvg-opensource-src-5.6.0-beta1-example-install.patch | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 qtsvg-opensource-src-5.6.0-beta1-example-install.patch diff --git a/qtsvg-opensource-src-5.6.0-beta1-example-install.patch b/qtsvg-opensource-src-5.6.0-beta1-example-install.patch new file mode 100644 index 0000000..a94571a --- /dev/null +++ b/qtsvg-opensource-src-5.6.0-beta1-example-install.patch @@ -0,0 +1,9 @@ +--- qtsvg-opensource-src-5.6.0-beta1/examples/svg/richtext/textobject/textobject.pro 2015-10-28 06:32:36.000000000 -0200 ++++ qtsvg-opensource-src-5.6.0-beta1/examples/svg/richtext/textobject/textobject.pro.new 2015-11-12 17:21:29.259985820 -0200 +@@ -13,5 +13,5 @@ + INSTALLS += target + + filesToDeploy.files = files/*.svg +-filesToDeploy.path = files ++filesToDeploy.path = $$[QT_INSTALL_EXAMPLES]/svg/richtext/textobject/files + DEPLOYMENT += filesToDeploy From 71f940bb8675ddece2fa58e3672e0e9142f8a62c Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 7 Dec 2015 13:01:39 +0100 Subject: [PATCH 3/3] (Re)add bootstrap macro support --- qt5-qtsvg.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/qt5-qtsvg.spec b/qt5-qtsvg.spec index 76b0151..5a46e21 100644 --- a/qt5-qtsvg.spec +++ b/qt5-qtsvg.spec @@ -1,14 +1,23 @@ %global qt_module qtsvg +# 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 - Support for rendering and displaying SVG 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 @@ -119,6 +128,9 @@ popd %changelog +* Mon Dec 07 2015 Jan Grulich - 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