From d92e0a3a98f9c50acf62e00c788a2e8188d21e83 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 26 Mar 2017 19:12:51 +0200 Subject: [PATCH] Update to 5.8.0 - New upstream version --- .gitignore | 1 + qt5-qtquickcontrols2.spec | 38 +++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 686046a..50321f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtquickcontrols2-opensource-src-5.7.1.tar.xz +/qtquickcontrols2-opensource-src-5.8.0.tar.xz diff --git a/qt5-qtquickcontrols2.spec b/qt5-qtquickcontrols2.spec index 579db8a..f251ca6 100644 --- a/qt5-qtquickcontrols2.spec +++ b/qt5-qtquickcontrols2.spec @@ -1,15 +1,17 @@ - %global qt_module qtquickcontrols2 -%define docs 1 +# To build without qttools doctools package, just undefine docs +%ifarch %{arm} %{ix86} x86_64 +%global docs 1 +%endif Name: qt5-%{qt_module} Summary: Qt5 - module with set of QtQuick controls for embedded -Version: 5.7.1 -Release: 4%{?dist} +Version: 5.8.0 +Release: 1%{?dist} License: GPLv2+ or LGPLv3 and GFDL Url: http://www.qt.io -Source0: http://download.qt.io/official_releases/qt/5.7/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +Source0: http://download.qt.io/official_releases/qt/5.8/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz # filter qml provides %global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$ @@ -33,8 +35,8 @@ and so are preferred for hardware with limited resources. Summary: API documentation for %{name} License: GFDL Requires: %{name} = %{version}-%{release} -BuildRequires: qt5-qdoc -BuildRequires: qt5-qhelpgenerator +BuildRequires: qt5-doctools +BuildRequires: qt5-qtbase-doc %description doc %{summary}. %endif @@ -101,7 +103,8 @@ rm -f %{buildroot}%{_qt5_libdir}/libQt5*.la %license LICENSE.LGPLv3 LICENSE.GPLv3 %{_qt5_libdir}/libQt5QuickTemplates2.so.5* %{_qt5_libdir}/libQt5QuickControls2.so.5* -%{_qt5_archdatadir}/qml/Qt/labs/calendar/ +%{_qt5_qmldir}/Qt/labs/calendar +%{_qt5_qmldir}/Qt/labs/platform %dir %{_qt5_archdatadir}/qml/QtQuick/Controls.2 %{_qt5_archdatadir}/qml/QtQuick/Controls.2/* %dir %{_qt5_archdatadir}/qml/QtQuick/Templates.2 @@ -110,9 +113,18 @@ rm -f %{buildroot}%{_qt5_libdir}/libQt5*.la %if 0%{?docs} %files doc %license LICENSE.FDL -%dir %{_qt5_docdir}/qtquickcontrols2/ +%dir %{_qt5_docdir}/qtquickcontrols2 %{_qt5_docdir}/qtquickcontrols2/* %{_qt5_docdir}/qtquickcontrols2.qch +%dir %{_qt5_docdir}/qtlabscalendar +%{_qt5_docdir}/qtlabscalendar/* +%{_qt5_docdir}/qtlabscalendar.qch +%dir %{_qt5_docdir}/qtlabsplatform +%{_qt5_docdir}/qtlabsplatform/* +%{_qt5_docdir}/qtlabsplatform.qch + +%files examples +%{_qt5_examplesdir}/quickcontrols2/ %endif %files devel @@ -126,13 +138,9 @@ rm -f %{buildroot}%{_qt5_libdir}/libQt5*.la %dir %{_libdir}/cmake/Qt5QuickControls2 %{_libdir}/cmake/Qt5QuickControls2/* -%files examples -%{_qt5_examplesdir}/quickcontrols2/ - - %changelog -* Sat Feb 11 2017 Fedora Release Engineering - 5.7.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild +* Mon Jan 30 2017 Helio Chissini de Castro - 5.8.0-1 +- New upstream version * Mon Jan 02 2017 Rex Dieter - 5.7.1-3 - filter qml provides diff --git a/sources b/sources index e10f387..9893e1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtquickcontrols2-opensource-src-5.7.1.tar.xz) = 24b142f60f3dbc52084906249e261ea8b788135a3dc2e45bb3fc885fe14f9281178025433b28e227891070adff3fe4b64c8a1f83ac4c9bde7f4a6048ea44370e +SHA512 (qtquickcontrols2-opensource-src-5.8.0.tar.xz) = e6ab84c046350ed58dfac49dd4460d8dc9efc28959ad24b4278ec83172713c4230dd72602a12fbd5c2f391d8140a766d79232285ead78057e43ec4d41b1b4e1b