From eed10b8d7d1ef38010af747bd561bce17199bcdc Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 29 Jun 2015 23:40:18 -0300 Subject: [PATCH] - Update rc1 5.5.0 --- .gitignore | 1 + qt5-qtquickcontrols.spec | 33 ++++++++++++++++----------------- sources | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 4572cec..0b8d3f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /qtquickcontrols-opensource-src-5.4.0.tar.xz /qtquickcontrols-opensource-src-5.4.1.tar.xz /qtquickcontrols-opensource-src-5.4.2.tar.xz +/qtquickcontrols-opensource-src-5.5.0-rc.tar.xz diff --git a/qt5-qtquickcontrols.spec b/qt5-qtquickcontrols.spec index 4bdf195..bfd623a 100644 --- a/qt5-qtquickcontrols.spec +++ b/qt5-qtquickcontrols.spec @@ -5,18 +5,16 @@ # where qt5-qttools builds are not yet available %define docs 1 +%define prerelease rc + Name: qt5-%{qt_module} Summary: Qt5 - module with set of QtQuick controls -Version: 5.4.2 -Release: 2%{?dist} +Version: 5.5.0 +Release: 0.2.rc%{?dist} -License: BSD and (LGPLv2 with exceptions or GPLv3 with exceptions) and GFDL -Url: http://qt-project.org/ -%if 0%{?pre:1} -Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz -%else -Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz -%endif +License: LGPLv2 or LGPLv3 and GFDL +Url: http://www.qt.io +Source0: http://download.qt.io/development_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-static >= %{version} @@ -52,7 +50,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep -%setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}} +%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} %build @@ -70,7 +68,6 @@ make %{?_smp_mflags} docs %endif popd - %install make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} @@ -78,14 +75,11 @@ make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} %endif - %files # better to own this elsewhere? qt5-qtbase? -- rex %dir %{_qt5_archdatadir}/qml %{_qt5_archdatadir}/qml/QtQuick/ -%doc LICENSE.LGPL* -%doc LICENSE.GPL* -%doc LGPL_EXCEPTION.txt +%doc LICENSE.* %if 0%{?docs} %files doc @@ -96,6 +90,8 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} %{_qt5_docdir}/qtquicklayouts/ %{_qt5_docdir}/qtquickdialogs.qch %{_qt5_docdir}/qtquickdialogs/ +%{_qt5_docdir}/qtquickextras.qch +%{_qt5_docdir}/qtquickextras/ %endif %if 0%{?_qt5_examplesdir:1} @@ -105,8 +101,11 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} %changelog -* Thu Jun 18 2015 Fedora Release Engineering - 5.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Thu Jun 25 2015 Helio Chissini de Castro - 5.5.0-0.2.rc +- Update for official RC1 released packages + +* Wed Jun 17 2015 Daniel Vrátil - 5.5.0-0.1.rc +- Qt 5.5.0 RC1 * Wed Jun 03 2015 Jan Grulich -5.4.2-1 - 5.4.2 diff --git a/sources b/sources index b755a3b..068dfab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -146f499a9f7c0009437077675134632d qtquickcontrols-opensource-src-5.4.2.tar.xz +3488dfcdafc0ffa1a4d440764b562afe qtquickcontrols-opensource-src-5.5.0-rc.tar.xz