From 6d9bd8e3a99412c07246d746b4c683a3a87463fe Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:31:40 +0000 Subject: import qt5-qtcanvas3d-5.9.2-1.el7 --- diff --git a/.gitignore b/.gitignore index a8d39fa..146149c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtcanvas3d-opensource-src-5.6.2.tar.xz +SOURCES/qtcanvas3d-opensource-src-5.9.2.tar.xz diff --git a/.qt5-qtcanvas3d.metadata b/.qt5-qtcanvas3d.metadata index 838a65a..3c3419d 100644 --- a/.qt5-qtcanvas3d.metadata +++ b/.qt5-qtcanvas3d.metadata @@ -1 +1 @@ -d222d070d8dd41853a2cb44c5e1238b2e53f4487 SOURCES/qtcanvas3d-opensource-src-5.6.2.tar.xz +105d2e9670587e32dae266991a364be6fca55e90 SOURCES/qtcanvas3d-opensource-src-5.9.2.tar.xz diff --git a/SPECS/qt5-qtcanvas3d.spec b/SPECS/qt5-qtcanvas3d.spec index dac151e..5acf99a 100644 --- a/SPECS/qt5-qtcanvas3d.spec +++ b/SPECS/qt5-qtcanvas3d.spec @@ -4,17 +4,16 @@ Summary: Qt5 - Canvas3d component Name: qt5-%{qt_module} -Version: 5.6.2 +Version: 5.9.2 Release: 1%{?dist} License: LGPLv2 with exceptions or GPLv3 with exceptions 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 -BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: qt5-qtbase-static >= %{version} -BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: qt5-qtbase-devel >= %{version} +BuildRequires: qt5-qtbase-static +BuildRequires: qt5-qtdeclarative-devel %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} @@ -45,25 +44,24 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{qmake_qt5} .. +%{qmake_qt5} make %{?_smp_mflags} + %if 0%{?docs} # HACK to avoid multilib conflicts in noarch content # see also https://bugreports.qt-project.org/browse/QTBUG-42071 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 @@ -77,13 +75,19 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} %{_qt5_docdir}/%{qt_module}/ %endif -%if 0%{?_qt5_examplesdir:1} %files examples %{_qt5_examplesdir}/canvas3d/ -%endif %changelog +* Fri Oct 06 2017 Jan Grulich - 5.9.2-1 +- Update to 5.9.2 + Resolves: bz#1482775 + +* Wed Aug 23 2017 Jan Grulich - 5.9.1-1 +- Update to 5.9.1 + Resolves: bz#1482775 + * Wed Jan 11 2017 Jan Grulich - 5.6.2-1 - Update to 5.6.2 Resolves: bz#1384815