Merge commit '9df6455bf2c140a9cab4a6a6d36e03f5ba0fa4e7' into f27
This commit is contained in:
commit
b7e33e9b65
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
/qtdeclarative-opensource-src-5.9.1.tar.xz
|
/qtdeclarative-opensource-src-5.9.1.tar.xz
|
||||||
/qtdeclarative-opensource-src-5.9.2.tar.xz
|
/qtdeclarative-opensource-src-5.9.2.tar.xz
|
||||||
|
/qtdeclarative-opensource-src-5.9.3.tar.xz
|
||||||
|
@ -13,8 +13,8 @@
|
|||||||
|
|
||||||
Summary: Qt5 - QtDeclarative component
|
Summary: Qt5 - QtDeclarative component
|
||||||
Name: qt5-%{qt_module}
|
Name: qt5-%{qt_module}
|
||||||
Version: 5.9.2
|
Version: 5.9.3
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
@ -52,6 +52,7 @@ Patch202: http://sources.debian.net/data/main/q/qtdeclarative-opensource-src/5.9
|
|||||||
%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
|
%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
|
||||||
|
|
||||||
Obsoletes: qt5-qtjsbackend < 5.2.0
|
Obsoletes: qt5-qtjsbackend < 5.2.0
|
||||||
|
Obsoletes: qt5-qtdeclarative-render2d < 5.7.1-10
|
||||||
|
|
||||||
BuildRequires: qt5-qtbase-devel >= %{version}
|
BuildRequires: qt5-qtbase-devel >= %{version}
|
||||||
BuildRequires: qt5-qtbase-private-devel
|
BuildRequires: qt5-qtbase-private-devel
|
||||||
@ -73,6 +74,7 @@ BuildRequires: xorg-x11-server-Xvfb
|
|||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for %{name}
|
Summary: Development files for %{name}
|
||||||
Obsoletes: qt5-qtjsbackend-devel < 5.2.0
|
Obsoletes: qt5-qtjsbackend-devel < 5.2.0
|
||||||
|
Obsoletes: qt5-qtdeclarative-render2d-devel < 5.7.1-10
|
||||||
Provides: %{name}-private-devel = %{version}-%{release}
|
Provides: %{name}-private-devel = %{version}-%{release}
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: qt5-qtbase-devel%{?_isa}
|
Requires: qt5-qtbase-devel%{?_isa}
|
||||||
@ -230,6 +232,12 @@ make check -k -C tests ||:
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Nov 23 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.3-1
|
||||||
|
- 5.9.3
|
||||||
|
|
||||||
|
* Tue Oct 31 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-3
|
||||||
|
- Obsoletes: qt5-qtdeclarative-render2d
|
||||||
|
|
||||||
* Thu Oct 26 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-2
|
* Thu Oct 26 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-2
|
||||||
- revert commit causing regresions (QTBUG-64017)
|
- revert commit causing regresions (QTBUG-64017)
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (qtdeclarative-opensource-src-5.9.2.tar.xz) = 49b8b50932b73ea39da14ac3425044193dfd64eabceadba379aa01cf2fc141177f9870c387caf1cf93ce09e8b197828a54b8d9fcefc4d9cdf400a6c6dd9a9e90
|
SHA512 (qtdeclarative-opensource-src-5.9.3.tar.xz) = 933caf5848437cde45b4bbf0c70b6cafbc690657c651508b28138b2f90d2f823f4842bc709f4726e2c88d3913a92240b0dcd9248d83af0d06d7127b9a8211b24
|
||||||
|
Loading…
Reference in New Issue
Block a user