- Update rc1 5.5.0

This commit is contained in:
Helio Chissini de Castro 2015-06-30 01:13:59 -03:00
parent 2b13726964
commit 9c082d0e0c
3 changed files with 17 additions and 25 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/qtwayland-opensource-src-5.4.1.tar.xz /qtwayland-opensource-src-5.4.1.tar.xz
/qtwayland-opensource-src-5.4.2.tar.xz /qtwayland-opensource-src-5.4.2.tar.xz
/qtwayland-opensource-src-5.5.0-rc.tar.xz

View File

@ -4,17 +4,15 @@
# build support for non-egl platforms # build support for non-egl platforms
%define nogl 1 %define nogl 1
%define prerelease rc
Summary: Qt5 - Wayland platform support and QtCompositor module Summary: Qt5 - Wayland platform support and QtCompositor module
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Version: 5.4.2 Version: 5.5.0
Release: 2%{?dist} Release: 0.2.rc%{?dist}
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or LGPLv3 with exceptions
Url: http://qt-project.org/wiki/QtWayland Url: http://www.qt.io
%if 0%{?pre:1} Source0: http://download.qt.io/development_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz
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
BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: qt5-qtbase-static BuildRequires: qt5-qtbase-static
@ -31,6 +29,7 @@ BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xcomposite)
BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libinput)
%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
@ -52,18 +51,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep %prep
%setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}} %setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
# 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 <QtWaylandClient/private/qwayland-wayland.h>
mkdir .git
%build %build
%if 0%{?nogl} %if 0%{?nogl}
# build support for non-egl platforms # build support for non-egl platforms
mkdir nogl mkdir nogl
@ -76,7 +66,6 @@ make %{?_smp_mflags} -C nogl
%{_qt5_qmake} CONFIG+=wayland-compositor %{_qt5_qmake} CONFIG+=wayland-compositor
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
%if 0%{?nogl} %if 0%{?nogl}
make install INSTALL_ROOT=%{buildroot} -C 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} \ include/QtCompositor/%{version}/QtCompositor/private/{wayland-wayland-server-protocol.h,qwayland-server-wayland.h} \
%{buildroot}%{_qt5_headerdir}/QtCompositor/%{version}/QtCompositor/private/ %{buildroot}%{_qt5_headerdir}/QtCompositor/%{version}/QtCompositor/private/
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%doc README %doc README
%doc LICENSE.LGPL* LICENSE.GPL* LGPL_EXCEPTION.txt %doc LICENSE.LGPL* LGPL_EXCEPTION.txt
%{_qt5_libdir}/libQt5Compositor.so.5* %{_qt5_libdir}/libQt5Compositor.so.5*
%{_qt5_libdir}/libQt5WaylandClient.so.5* %{_qt5_libdir}/libQt5WaylandClient.so.5*
%dir %{_qt5_plugindir}/wayland-decoration-client/ %dir %{_qt5_plugindir}/wayland-decoration-client/
@ -143,8 +131,11 @@ install -pm644 \
%changelog %changelog
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4.2-2 * Thu Jun 25 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.0-0.2.rc
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - Update for official RC1 released packages
* Wed Jun 17 2015 Daniel Vrátil <dvratil@redhat.com> - 5.5.0-0.1.rc
- Qt5 5.5.0 RC1
* Wed Jun 03 2015 Jan Grulich <jgrulich@redhat.com> - 5.4.2-1 * Wed Jun 03 2015 Jan Grulich <jgrulich@redhat.com> - 5.4.2-1
- 5.4.2 - 5.4.2

View File

@ -1 +1 @@
68de7d22a4275e55e787fb8b0f0e2896 qtwayland-opensource-src-5.4.2.tar.xz 6af935d192ab3f0c5ea1a99075cad38c qtwayland-opensource-src-5.5.0-rc.tar.xz