Merge branch 'master' into f22

This commit is contained in:
Rex Dieter 2015-11-01 22:50:29 -06:00
commit 4cd3c8a977
3 changed files with 12 additions and 4 deletions

2
.gitignore vendored
View File

@ -3,3 +3,5 @@
/qttools-opensource-src-5.4.2.tar.xz /qttools-opensource-src-5.4.2.tar.xz
/qttools-opensource-src-5.5.0-rc.tar.xz /qttools-opensource-src-5.5.0-rc.tar.xz
/qttools-opensource-src-5.5.0.tar.xz /qttools-opensource-src-5.5.0.tar.xz
/qttools-opensource-src-5.5.1-rc1.tar.xz
/qttools-opensource-src-5.5.1.tar.xz

View File

@ -15,12 +15,12 @@
%endif %endif
%endif %endif
#define prerelease rc ## define prerelease rc1
Summary: Qt5 - QtTool components Summary: Qt5 - QtTool components
Name: qt5-qttools Name: qt5-qttools
Version: 5.5.0 Version: 5.5.1
Release: 4%{?dist} Release: 2%{?dist}
License: LGPLv3 or LGPLv2 License: LGPLv3 or LGPLv2
Url: http://www.qt.io Url: http://www.qt.io
@ -466,6 +466,12 @@ fi
%changelog %changelog
* Thu Oct 15 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-2
- Update to final release 5.5.1
* Tue Sep 29 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.1-1
- Update to Qt 5.5.1 RC1
* Sat Aug 08 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-4 * Sat Aug 08 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-4
- qt5-linguist: move lconvert,lrelease,lupdate, cmake Qt5LinguistTools here - qt5-linguist: move lconvert,lrelease,lupdate, cmake Qt5LinguistTools here

View File

@ -1 +1 @@
2057ef2110b6a1aec260a69e2860a502 qttools-opensource-src-5.5.0.tar.xz 535ff9df9d83e9bde08ee3913b751d07 qttools-opensource-src-5.5.1.tar.xz