From fb86a5b6d7d55b51ba258736b647df145ad5bbc7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 10 Apr 2013 07:53:23 -0500 Subject: [PATCH] 5.0.2-1 - 5.0.2 - fix cmake config (#929227) --- .gitignore | 1 - qt5-qtbase.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0163698..15aa9d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/qtbase-opensource-src-5.0.1.tar.xz /qtbase-opensource-src-5.0.2.tar.xz diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 540de2e..7ded802 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -5,17 +5,15 @@ # support qtchooser (adds qtchooser .conf file) #define qtchooser 1 -%define pre rc1 - Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.0.2 -Release: 0.1.%{pre}%{?dist} +Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions 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 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 ##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 # 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 rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags +%patch100 -p1 -b .cmake_path %patch1341 -p1 -b .0341 # drop -fexceptions from $RPM_OPT_FLAGS @@ -460,6 +462,10 @@ popd %changelog +* Wed Apr 10 2013 Rex Dieter - 5.0.2-1 +- 5.0.2 +- fix cmake config (#929227) + * Tue Apr 02 2013 Rex Dieter 5.0.2-0.1.rc1 - 5.0.2-rc1 diff --git a/sources b/sources index 425be4c..4eb8da6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c1800c0680fe6185cdc29ea9f5dfeb4b qtbase-opensource-src-5.0.2.tar.xz +a4fec8ed03867c4ee4fe5a46001a11f0 qtbase-opensource-src-5.0.2.tar.xz