Merge branch 'master' into f23

This commit is contained in:
Rex Dieter 2016-03-19 16:33:43 -05:00
commit 482e49920e
1 changed files with 10 additions and 1 deletions

View File

@ -17,7 +17,7 @@
Summary: Qt5 - QtDeclarative component
Name: qt5-%{qt_module}
Version: 5.6.0
Release: 1%{?prerelease:.%{prerelease}}%{?dist}
Release: 3%{?prerelease:.%{prerelease}}%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -35,8 +35,11 @@ Patch2: qtdeclarative-QQuickShaderEffectSource_deadlock.patch
Obsoletes: qt5-qtjsbackend < 5.2.0
BuildRequires: cmake
BuildRequires: qt5-qtbase-devel >= %{version}
%if ! 0%{?bootstrap}
BuildRequires: pkgconfig(Qt5XmlPatterns)
%endif
BuildRequires: python
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
@ -213,6 +216,12 @@ popd
%changelog
* Sat Mar 19 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-3
- BR: cmake (cmake autoprovides)
* Fri Mar 18 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-2
- rebuild
* Mon Mar 14 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-1
- 5.6.0 final release