From 9c082d0e0cc8f79777fbc0e11af94fdd362a07c4 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Tue, 30 Jun 2015 01:13:59 -0300 Subject: [PATCH] - Update rc1 5.5.0 --- .gitignore | 1 + qt5-qtwayland.spec | 39 +++++++++++++++------------------------ sources | 2 +- 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 5d8fe30..2030352 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /qtwayland-opensource-src-5.4.1.tar.xz /qtwayland-opensource-src-5.4.2.tar.xz +/qtwayland-opensource-src-5.5.0-rc.tar.xz diff --git a/qt5-qtwayland.spec b/qt5-qtwayland.spec index 09b1d6c..0ef12e5 100644 --- a/qt5-qtwayland.spec +++ b/qt5-qtwayland.spec @@ -4,17 +4,15 @@ # build support for non-egl platforms %define nogl 1 +%define prerelease rc + Summary: Qt5 - Wayland platform support and QtCompositor module Name: qt5-%{qt_module} -Version: 5.4.2 -Release: 2%{?dist} -License: LGPLv2 with exceptions or GPLv3 with exceptions -Url: http://qt-project.org/wiki/QtWayland -%if 0%{?pre:1} -Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz -%else -Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz -%endif +Version: 5.5.0 +Release: 0.2.rc%{?dist} +License: LGPLv2 with exceptions or LGPLv3 with exceptions +Url: http://www.qt.io +Source0: http://download.qt.io/development_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 @@ -31,6 +29,7 @@ BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(libinput) %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} @@ -52,18 +51,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep -%setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}} - -# Presence of .git/ qmake into invoking syncqt for us with -# correct arguments at make time. -# else, out-of-src-tree builds fail with stuff like: -# qwaylanddisplay_p.h:52:54: fatal error: QtWaylandClient/private/qwayland-wayland.h: No such file or directory -# #include -mkdir .git - +%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} %build - %if 0%{?nogl} # build support for non-egl platforms mkdir nogl @@ -76,7 +66,6 @@ make %{?_smp_mflags} -C nogl %{_qt5_qmake} CONFIG+=wayland-compositor make %{?_smp_mflags} - %install %if 0%{?nogl} make install INSTALL_ROOT=%{buildroot} -C nogl/ @@ -101,13 +90,12 @@ install -pm644 \ include/QtCompositor/%{version}/QtCompositor/private/{wayland-wayland-server-protocol.h,qwayland-server-wayland.h} \ %{buildroot}%{_qt5_headerdir}/QtCompositor/%{version}/QtCompositor/private/ - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %doc README -%doc LICENSE.LGPL* LICENSE.GPL* LGPL_EXCEPTION.txt +%doc LICENSE.LGPL* LGPL_EXCEPTION.txt %{_qt5_libdir}/libQt5Compositor.so.5* %{_qt5_libdir}/libQt5WaylandClient.so.5* %dir %{_qt5_plugindir}/wayland-decoration-client/ @@ -143,8 +131,11 @@ install -pm644 \ %changelog -* Thu Jun 18 2015 Fedora Release Engineering - 5.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Thu Jun 25 2015 Helio Chissini de Castro - 5.5.0-0.2.rc +- Update for official RC1 released packages + +* Wed Jun 17 2015 Daniel Vrátil - 5.5.0-0.1.rc +- Qt5 5.5.0 RC1 * Wed Jun 03 2015 Jan Grulich - 5.4.2-1 - 5.4.2 diff --git a/sources b/sources index d09594a..16d87f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68de7d22a4275e55e787fb8b0f0e2896 qtwayland-opensource-src-5.4.2.tar.xz +6af935d192ab3f0c5ea1a99075cad38c qtwayland-opensource-src-5.5.0-rc.tar.xz