Merge branch 'f22' into f21

2015-02-25 16:05:24 +01:00 · 2015-02-25 16:05:24 +01:00 · c4165e6307
commit c4165e6307
parent 5e14dd0023 e4d350f235
3 changed files with 9 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
 /qttools-opensource-src-5.4.0.tar.xz
+/qttools-opensource-src-5.4.1.tar.xz
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@ -16,7 +16,7 @@

 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
-Version: 5.4.0
+Version: 5.4.1
 Release: 1%{?dist}

 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
@ -424,6 +424,12 @@ fi


 %changelog
+* Tue Feb 24 2015 Jan Grulich <jgrulich@redhat.com> 5.4.1-1
+- 5.4.1
+
+* Thu Feb 19 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.4.0-2
+- rebuild (gcc5)
+
 * Wed Dec 10 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-1
 - 5.4.0 (final)

--- a/2
+++ b/2
@ -1 +1 @@
-3de5923257b365526856094d7da0ad85  qttools-opensource-src-5.4.0.tar.xz
+5b2fd42304e9294bc0f77095fdb35ad6  qttools-opensource-src-5.4.1.tar.xz