Merge branch 'f22' into f21

This commit is contained in:
Jan Grulich 2015-02-25 10:43:25 +01:00
commit ed8ad4c53e
3 changed files with 14 additions and 2 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/qtdeclarative-opensource-src-5.4.0.tar.xz
/qtdeclarative-opensource-src-5.4.1.tar.xz

View File

@ -12,7 +12,7 @@
Summary: Qt5 - QtDeclarative component
Name: qt5-%{qt_module}
Version: 5.4.0
Version: 5.4.1
Release: 1%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
@ -172,6 +172,7 @@ popd
%{_qt5_libdir}/libQt5QuickTest.so.5*
%{_qt5_plugindir}/qmltooling/
%{_qt5_archdatadir}/qml/
%dir %{_qt5_libdir}/cmake/Qt5Qml/
%{_qt5_libdir}/cmake/Qt5Qml/Qt5Qml_QTcpServerConnection.cmake
%{_qt5_libdir}/cmake/Qt5Qml/Qt5Qml_QtQuick2Plugin.cmake
@ -184,6 +185,7 @@ popd
%{_qt5_libdir}/libQt5Quick*.so
%{_qt5_libdir}/libQt5QuickWidgets.so.5
%{_qt5_libdir}/libQt5Quick*.prl
%dir %{_qt5_libdir}/cmake/Qt5Quick*/
%{_qt5_libdir}/cmake/Qt5*/Qt5*Config*.cmake
%{_qt5_libdir}/pkgconfig/Qt5*.pc
%{_qt5_archdatadir}/mkspecs/modules/*.pri
@ -207,6 +209,15 @@ popd
%changelog
* Tue Feb 24 2015 Jan Grulich <jgrulich@redhat.com> 5.4.1-1
- 5.4.1
* Mon Feb 16 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-3
- rebuild (gcc)
* Sat Feb 14 2015 Ville Skyttä <ville.skytta@iki.fi> - 5.4.0-2
- Fix cmake dir ownerhips
* Wed Dec 10 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-1
- 5.4.0 (final)

View File

@ -1 +1 @@
4f928e52e72b5e867b50b4d409d5e99b qtdeclarative-opensource-src-5.4.0.tar.xz
86dfe5c41e14a142c72fdaa6a64f933c qtdeclarative-opensource-src-5.4.1.tar.xz