From da5875b279f9a549eddbdd11ef17d09df1df075f Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 21 Dec 2015 09:14:47 +0100 Subject: [PATCH] - Update to final beta --- qt5-qtwebchannel.spec | 5 ++++- sources | 6 +----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/qt5-qtwebchannel.spec b/qt5-qtwebchannel.spec index 88057e2..732793e 100644 --- a/qt5-qtwebchannel.spec +++ b/qt5-qtwebchannel.spec @@ -7,7 +7,7 @@ Summary: Qt5 - WebChannel component Name: qt5-%{qt_module} Version: 5.6.0 -Release: 0.3%{?dist} +Release: 0.4%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://doc.qt.io/qt-5/licensing.html @@ -124,6 +124,9 @@ popd %changelog +* Mon Dec 21 2015 Helio Chissini de Castro - 5.6.0-0.4 +- Update to final beta release + * Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.3 - Official beta release diff --git a/sources b/sources index 6040d9a..3a0ce13 100644 --- a/sources +++ b/sources @@ -1,5 +1 @@ -<<<<<<< HEAD -dbd637b0e90d3fea56141e3d277071ed qtwebchannel-opensource-src-5.6.0-beta.tar.gz -======= -e8da7c6f669054e8828947a9af924ae1 qtwebchannel-opensource-src-5.6.0-beta1.tar.xz ->>>>>>> 7d85456e17a9edac864567ac1629384b20ddb440 +daa342a130ee003823466fd2810fff35 qtwebchannel-opensource-src-5.6.0-beta.tar.gz