From 62110f8880591598d4d038195b8bbd20a49d1b3d Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 7 Dec 2015 13:46:03 +0100 Subject: [PATCH] 5.6.0 (sync with qt5 copr) --- .gitignore | 1 + qt5-qtwayland.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2c5425a..51c8867 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /qtwayland-opensource-src-5.5.0.tar.xz /qtwayland-opensource-src-5.5.1-rc1.tar.xz /qtwayland-opensource-src-5.5.1.tar.xz +/qtwayland-opensource-src-5.6.0-beta1.tar.xz diff --git a/qt5-qtwayland.spec b/qt5-qtwayland.spec index 696cb03..6fc70bc 100644 --- a/qt5-qtwayland.spec +++ b/qt5-qtwayland.spec @@ -4,19 +4,19 @@ # build support for non-egl platforms %define nogl 1 -## define prerelease rc1 +%define prerelease beta1 Summary: Qt5 - Wayland platform support and QtCompositor module Name: qt5-%{qt_module} -Version: 5.5.1 -Release: 2%{?dist} +Version: 5.6.0 +Release: 1%{?dist} License: LGPLv2 with exceptions or LGPLv3 with exceptions Url: http://www.qt.io Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-static -BuildRequires: qt5-qtdeclarative-devel +BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(wayland-scanner) BuildRequires: pkgconfig(wayland-server) @@ -112,7 +112,7 @@ install -pm644 \ %{_qt5_libdir}/cmake/Qt5Compositor/Qt5Compositor_*.cmake %{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_*.cmake %dir %{_qt5_libdir}/cmake/Qt5WaylandClient/ -%{_qt5_libdir}/cmake/Qt5WaylandClient/Qt5WaylandClient_*.cmake +%{_qt5_libdir}/cmake/Qt5WaylandClient/*.cmake %files devel %{_qt5_bindir}/qtwaylandscanner @@ -133,6 +133,9 @@ install -pm644 \ %changelog +* Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 +- Start to implement 5.6.0 beta + * Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 - Update to final release 5.5.1 diff --git a/sources b/sources index a8d3394..171fa82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5312f2508f4856d8e60a1374070cec34 qtwayland-opensource-src-5.5.1.tar.xz +dcc330d42972c5a7b0e7d9375b2b753b qtwayland-opensource-src-5.6.0-beta1.tar.xz