- Update rc1 5.5.0
This commit is contained in:
parent
8dc2f6402b
commit
5ab05bbb63
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@
|
||||
/qtmultimedia-opensource-src-5.4.0.tar.xz
|
||||
/qtmultimedia-opensource-src-5.4.1.tar.xz
|
||||
/qtmultimedia-opensource-src-5.4.2.tar.xz
|
||||
/qtmultimedia-opensource-src-5.5.0-rc.tar.xz
|
||||
|
@ -10,7 +10,7 @@
|
||||
%global openal 1
|
||||
%endif
|
||||
|
||||
#define pre beta
|
||||
%define prerelease rc
|
||||
|
||||
%define gst 0.10
|
||||
%if 0%{?fedora} > 20
|
||||
@ -19,21 +19,13 @@
|
||||
|
||||
Summary: Qt5 - Multimedia support
|
||||
Name: qt5-%{qt_module}
|
||||
Version: 5.4.2
|
||||
Release: 2%{?dist}
|
||||
Version: 5.5.0
|
||||
Release: 0.2.rc%{?dist}
|
||||
|
||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
Url: http://qt-project.org/
|
||||
%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
|
||||
|
||||
## upstream patches dev/ branch
|
||||
# pull this in for now, may end up tracking dev/ branch snapshots when/if there are bugfixes
|
||||
Patch106: 0006-GStreamer-port-to-1.0.patch
|
||||
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-qtdeclarative-devel >= %{version}
|
||||
@ -90,24 +82,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
|
||||
%prep
|
||||
%setup -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}
|
||||
|
||||
# this happens to introduce some new stuff even for gst-0.10
|
||||
# GST_VIDEO_FORMAT_RGB16 (introduced in 0.10.30) , so omit for el6
|
||||
# FIXME/TODO: look into making compat via
|
||||
# #if GST_CHECK_VERSION(0,10,30) ...
|
||||
%if 0%{?rhel} != 6
|
||||
%patch106 -p1 -b .0006
|
||||
%endif
|
||||
|
||||
# force version match, snapshot is marked 5.5.0 currently
|
||||
sed -i -e "s|^MODULE_VERSION =.*|MODULE_VERSION = %{version}|" .qmake.conf
|
||||
|
||||
# do this... or CONFIG+=git_build below
|
||||
# I've no idea really why this is needed, but without it, some private headers
|
||||
# do not get created
|
||||
#syncqt.pl -version %{version}
|
||||
|
||||
%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
|
||||
|
||||
%build
|
||||
mkdir %{_target_platform}
|
||||
@ -199,8 +174,11 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
* Wed Jun 24 2015 Helio Chissini de Castro <helio@kde.org> - 5.5.0-0.2.rc
|
||||
- Update for official RC1 released packages
|
||||
|
||||
* Wed Jun 17 2015 Daniel Vrátil <dvratil@redhat.com> - 5.5.0-0.1.rc
|
||||
- Qt 5.5.0 RC1
|
||||
|
||||
* Wed Jun 03 2015 Jan Grulich <jgrulich@redhat.com> - 5.4.2-1
|
||||
- 5.4.2
|
||||
|
Loading…
Reference in New Issue
Block a user