From 504579cb2493b5922f19f08fba82cc6d88200dd1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:38:00 +0000 Subject: import qt5-qtquickcontrols-5.9.2-1.el7 --- diff --git a/.gitignore b/.gitignore index 35f19d7..197fa5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtquickcontrols-opensource-src-5.6.2.tar.xz +SOURCES/qtquickcontrols-opensource-src-5.9.2.tar.xz diff --git a/.qt5-qtquickcontrols.metadata b/.qt5-qtquickcontrols.metadata index e1c1a43..a76e55d 100644 --- a/.qt5-qtquickcontrols.metadata +++ b/.qt5-qtquickcontrols.metadata @@ -1 +1 @@ -0a5e83a4434f794281229cb720e4ee302114ff91 SOURCES/qtquickcontrols-opensource-src-5.6.2.tar.xz +19450c50fcdb1d32ee7fa02f0df94ee24bf1e1ec SOURCES/qtquickcontrols-opensource-src-5.9.2.tar.xz diff --git a/SPECS/qt5-qtquickcontrols.spec b/SPECS/qt5-qtquickcontrols.spec index 91801dc..b10f888 100644 --- a/SPECS/qt5-qtquickcontrols.spec +++ b/SPECS/qt5-qtquickcontrols.spec @@ -5,20 +5,20 @@ Name: qt5-%{qt_module} Summary: Qt5 - module with set of QtQuick controls -Version: 5.6.2 +Version: 5.9.2 Release: 1%{?dist} License: LGPLv2 or LGPLv3 and GFDL Url: http://www.qt.io -Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +Source0: http://download.qt.io/official_releases/qt/5.9/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz + +# filter qml provides +%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$ BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-static >= %{version} -BuildRequires: qt5-qtbase-private-devel -%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -BuildRequires: qt5-qtdeclarative-private-devel -%{?_qt5:Requires: qt5-qtdeclarative%{?_isa} = %{_qt5_version}} +BuildRequires: qt5-qtdeclarative-devel %description The Qt Quick Controls module provides a set of controls that can be used to @@ -48,9 +48,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{qmake_qt5} .. +%{qmake_qt5} make %{?_smp_mflags} @@ -60,14 +58,14 @@ make %{?_smp_mflags} QT_HASH_SEED=0; export QT_HASH_SEED make %{?_smp_mflags} docs %endif -popd + %install -make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} +make install INSTALL_ROOT=%{buildroot} %if 0%{?docs} -make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} +make install_docs INSTALL_ROOT=%{buildroot} %endif @@ -80,8 +78,6 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} %doc LICENSE.FDL %{_qt5_docdir}/qtquickcontrols.qch %{_qt5_docdir}/qtquickcontrols/ -%{_qt5_docdir}/qtquicklayouts.qch -%{_qt5_docdir}/qtquicklayouts/ %{_qt5_docdir}/qtquickdialogs.qch %{_qt5_docdir}/qtquickdialogs/ %{_qt5_docdir}/qtquickextras.qch @@ -95,6 +91,14 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} %changelog +* Fri Oct 06 2017 Jan Grulich - 5.9.2-1 +- Update to 5.9.2 + Resolves: bz#1482785 + +* Mon Aug 28 2017 Jan Grulich - 5.9.1-1 +- Update to 5.9.1 + Resolves: bz#1482785 + * Wed Jan 11 2017 Jan Grulich - 5.6.2-1 - Update to 5.6.2 Resolves: bz#1384824