From ef44e88530c83ffda95fee8b134389bd455dbd6c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:35:33 +0000 Subject: import qt5-qtmultimedia-5.6.2-1.el7 --- diff --git a/.gitignore b/.gitignore index f8977db..84d6002 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtmultimedia-opensource-src-5.6.1.tar.xz +SOURCES/qtmultimedia-opensource-src-5.6.2.tar.xz diff --git a/.qt5-qtmultimedia.metadata b/.qt5-qtmultimedia.metadata index 6b7216b..bd49158 100644 --- a/.qt5-qtmultimedia.metadata +++ b/.qt5-qtmultimedia.metadata @@ -1 +1 @@ -797dacd8705ea73f61770f1f866bf008e2069593 SOURCES/qtmultimedia-opensource-src-5.6.1.tar.xz +d0830726bf2d9d6542c946f9fad999de7c561138 SOURCES/qtmultimedia-opensource-src-5.6.2.tar.xz diff --git a/SPECS/qt5-qtmultimedia.spec b/SPECS/qt5-qtmultimedia.spec index 0b9ef4d..b99f176 100644 --- a/SPECS/qt5-qtmultimedia.spec +++ b/SPECS/qt5-qtmultimedia.spec @@ -21,21 +21,19 @@ %global gst 1.0 %endif -#define prerelease - Summary: Qt5 - Multimedia support Name: qt5-%{qt_module} -Version: 5.6.1 -Release: 10%{?prerelease:.%{prerelease}}%{?dist} +Version: 5.6.2 +Release: 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/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz +Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz BuildRequires: cmake BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: pkgconfig(Qt5Quick) >= %{version} +BuildRequires: qt5-qtdeclarative-devel >= %{version} BuildRequires: pkgconfig(alsa) %if "%{?gst}" == "0.10" BuildRequires: pkgconfig(gstreamer-interfaces-0.10) @@ -53,6 +51,8 @@ BuildRequires: pkgconfig(openal) %endif BuildRequires: pkgconfig(xv) +BuildRequires: qt5-qtbase-private-devel + %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} %description @@ -89,7 +89,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep -%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} +%setup -q -n %{qt_module}-opensource-src-%{version} %build @@ -179,6 +179,10 @@ popd %changelog +* Wed Jan 11 2017 Jan Grulich - 5.6.2-1 +- Update to 5.6.2 + Resolves: bz#1384823 + * Tue Aug 30 2016 Jan Grulich - 5.6.1-10 - Increase build version to have newer version than in EPEL Resolves: bz#1317406