diff --git a/.gitignore b/.gitignore index d355736..8477291 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /qtquickcontrols-opensource-src-5.5.1-rc1.tar.xz /qtquickcontrols-opensource-src-5.5.1.tar.xz /qtquickcontrols-opensource-src-5.6.0-beta.tar.gz +/qtquickcontrols-opensource-src-5.6.0-beta1.tar.xz diff --git a/qt5-qtquickcontrols.spec b/qt5-qtquickcontrols.spec index f87dffd..3821144 100644 --- a/qt5-qtquickcontrols.spec +++ b/qt5-qtquickcontrols.spec @@ -8,7 +8,7 @@ Name: qt5-%{qt_module} Summary: Qt5 - module with set of QtQuick controls Version: 5.6.0 -Release: 0.2%{?dist} +Release: 0.3%{?dist} License: LGPLv2 or LGPLv3 and GFDL Url: http://www.qt.io @@ -101,7 +101,7 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} %changelog -* Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.2 +* Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.3 - Official beta release * Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 diff --git a/sources b/sources index 30500ef..79aa9fc 100644 --- a/sources +++ b/sources @@ -1 +1,5 @@ +<<<<<<< HEAD bd9779b99bc8031166b2972ee2f80b83 qtquickcontrols-opensource-src-5.6.0-beta.tar.gz +======= +d3df94b69827f940f0f80f993db4b87c qtquickcontrols-opensource-src-5.6.0-beta1.tar.xz +>>>>>>> 268002b0616dfc5f3c6c3acbbd6229bef41e6766