- 5.0.2
- fix cmake config (#929227)
This commit is contained in:
Rex Dieter 2013-04-10 07:53:23 -05:00
parent 145ae2bd4c
commit fb86a5b6d7
3 changed files with 11 additions and 6 deletions

1
.gitignore vendored
View File

@ -1,2 +1 @@
/qtbase-opensource-src-5.0.1.tar.xz
/qtbase-opensource-src-5.0.2.tar.xz /qtbase-opensource-src-5.0.2.tar.xz

View File

@ -5,17 +5,15 @@
# support qtchooser (adds qtchooser .conf file) # support qtchooser (adds qtchooser .conf file)
#define qtchooser 1 #define qtchooser 1
%define pre rc1
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Name: qt5-qtbase Name: qt5-qtbase
Version: 5.0.2 Version: 5.0.2
Release: 0.1.%{pre}%{?dist} Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://qt-project.org/ Url: http://qt-project.org/
Source0: http://releases.qt-project.org/qt5/%{version}%{?pre:-%{pre}}/submodules_tar/qtbase-opensource-src-%{version}.tar.xz Source0: http://releases.qt-project.org/qt5/%{version}%{?pre:-%{pre}}/submodules/qtbase-opensource-src-%{version}.tar.xz
# help build on some lowmem archs, e.g. drop hard-coded -O3 optimization on some files # help build on some lowmem archs, e.g. drop hard-coded -O3 optimization on some files
Patch1: qtbase-opensource-src-5.0.1-lowmem.patch Patch1: qtbase-opensource-src-5.0.1-lowmem.patch
@ -24,6 +22,9 @@ Patch1: qtbase-opensource-src-5.0.1-lowmem.patch
Patch2: qtbase-multilib_optflags.patch Patch2: qtbase-multilib_optflags.patch
##upstream patches ##upstream patches
# https://bugzilla.redhat.com/929227
# https://codereview.qt-project.org/52778
Patch100: qtbase-opensource-src-5.0.2-cmake_path.patch
Patch1341: 0341-Rename-qAbs-Function-for-timeval.patch Patch1341: 0341-Rename-qAbs-Function-for-timeval.patch
# macros # macros
@ -145,6 +146,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
# drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463 # drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463
rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
%patch100 -p1 -b .cmake_path
%patch1341 -p1 -b .0341 %patch1341 -p1 -b .0341
# drop -fexceptions from $RPM_OPT_FLAGS # drop -fexceptions from $RPM_OPT_FLAGS
@ -460,6 +462,10 @@ popd
%changelog %changelog
* Wed Apr 10 2013 Rex Dieter <rdieter@fedoraproject.org> - 5.0.2-1
- 5.0.2
- fix cmake config (#929227)
* Tue Apr 02 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-0.1.rc1 * Tue Apr 02 2013 Rex Dieter <rdieter@fedoraproject.org> 5.0.2-0.1.rc1
- 5.0.2-rc1 - 5.0.2-rc1

View File

@ -1 +1 @@
c1800c0680fe6185cdc29ea9f5dfeb4b qtbase-opensource-src-5.0.2.tar.xz a4fec8ed03867c4ee4fe5a46001a11f0 qtbase-opensource-src-5.0.2.tar.xz