Merge branch 'master' into el6

2015-06-09 08:17:30 -05:00 · 2015-06-09 08:17:30 -05:00 · 99c9d197ec
parent 0484945676 d33994e263
commit 99c9d197ec
3 changed files with 12 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
 /qttools-opensource-src-5.4.0.tar.xz
 /qttools-opensource-src-5.4.1.tar.xz
+/qttools-opensource-src-5.4.2.tar.xz
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@ -16,7 +16,7 @@

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

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


 %changelog
+* Wed Jun 03 2015 Jan Grulich <jgrulich@redhat.com> - 5.4.2-1
+- 5.4.2
+
+* Sat May 02 2015 Rex Dieter <rdieter@fedoraproject.org> 5.4.1-3
+- rebuild (gcc5)
+
+* Fri Feb 27 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.4.1-2
+- rebuild (gcc5)
+
 * Tue Feb 24 2015 Jan Grulich <jgrulich@redhat.com> 5.4.1-1
 - 5.4.1

--- a/2
+++ b/2
@ -1 +1 @@
-5b2fd42304e9294bc0f77095fdb35ad6  qttools-opensource-src-5.4.1.tar.xz
+2949a16131b54169119d1a14b891a10b  qttools-opensource-src-5.4.2.tar.xz