- Update rc1 5.5.0

This commit is contained in:
Helio Chissini de Castro 2015-06-29 23:20:54 -03:00
parent e30f3fe8c1
commit 7487bbb35a
3 changed files with 16 additions and 17 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/qtlocation-opensource-src-5.4.0.tar.xz
/qtlocation-opensource-src-5.4.1.tar.xz
/qtlocation-opensource-src-5.4.2.tar.xz
/qtlocation-opensource-src-5.5.0-rc.tar.xz

View File

@ -1,27 +1,26 @@
%global qt_module qtlocation
# define to build docs, need to undef this for bootstrapping
%define docs 1
%define docs 0
%define prerelease rc
Summary: Qt5 - Location component
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
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
## upstreamable patches
# try to support older glib2 (like el6)
Patch50: qtlocation-opensource-src-5.4.0-G_VALUE_INIT.patch
BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: qt5-qtdeclarative-devel >= %{version}
BuildRequires: pkgconfig(Qt5Qml) >= 5.4.0
BuildRequires: pkgconfig(geoclue)
%if 0%{?rhel} < 7
@ -61,12 +60,10 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep
%setup -q -n %{qt_module}-opensource-src-%{version}%{?pre:-%{pre}}
%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
## G_VALUE_INIT is new in glib-2.30+ only
%patch50 -p1 -b .G_VALUE_INIT
%build
mkdir %{_target_platform}
pushd %{_target_platform}
@ -79,7 +76,6 @@ make %{?_smp_mflags} docs
%endif
popd
%install
make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
@ -99,7 +95,6 @@ for prl_file in libQt5*.prl ; do
done
popd
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@ -147,8 +142,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
* Mon Jun 15 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

View File

@ -1 +1 @@
6f8843d44ff15196d1e93077cd24388c qtlocation-opensource-src-5.4.2.tar.xz
6c25f542411997cebd3752698104f3c1 qtlocation-opensource-src-5.5.0-rc.tar.xz