From 43522981acec4a247745df7b9dc21a485c5927b9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 2 Dec 2013 13:44:15 -0600 Subject: [PATCH] 5.2.0-rc1 --- .gitignore | 1 + qt5-qtscript.spec | 10 +++++++--- ...0.patch => qtscript-opensource-src-5.2.0-s390.patch | 10 +++++----- sources | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) rename qtscript-opensource-src-5.2.0-alpha-s390.patch => qtscript-opensource-src-5.2.0-s390.patch (62%) diff --git a/.gitignore b/.gitignore index 05af881..99a04ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /qtscript-opensource-src-5.1.1.tar.xz /qtscript-opensource-src-5.2.0-beta1.tar.xz +/qtscript-opensource-src-5.2.0-rc1.tar.xz diff --git a/qt5-qtscript.spec b/qt5-qtscript.spec index 1361db2..4c47511 100644 --- a/qt5-qtscript.spec +++ b/qt5-qtscript.spec @@ -1,6 +1,6 @@ %global qt_module qtscript -%define pre beta1 +%define pre rc1 # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available @@ -12,7 +12,7 @@ Summary: Qt5 - QtScript component Name: qt5-%{qt_module} Version: 5.2.0 -Release: 0.5.%{pre}%{?dist} +Release: 0.10.%{pre}%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -22,8 +22,9 @@ Source0: http://download.qt-project.org/development_releases/qt/5.2/%{version}-% %else Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz %endif + # add s390(x0 support to Platform.h (taken from webkit) -Patch0: qtscript-opensource-src-5.2.0-alpha-s390.patch +Patch0: qtscript-opensource-src-5.2.0-s390.patch BuildRequires: qt5-qtbase-devel >= %{version} @@ -109,6 +110,9 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la %changelog +* Mon Dec 02 2013 Rex Dieter 5.2.0-0.10.rc1 +- 5.2.0-rc1 + * Mon Nov 25 2013 Rex Dieter 5.2.0-0.5.beta1 - enable -doc only on primary archs (allow secondary bootstrap) diff --git a/qtscript-opensource-src-5.2.0-alpha-s390.patch b/qtscript-opensource-src-5.2.0-s390.patch similarity index 62% rename from qtscript-opensource-src-5.2.0-alpha-s390.patch rename to qtscript-opensource-src-5.2.0-s390.patch index 7507b48..1a0a62d 100644 --- a/qtscript-opensource-src-5.2.0-alpha-s390.patch +++ b/qtscript-opensource-src-5.2.0-s390.patch @@ -1,6 +1,6 @@ -diff -up qtscript-opensource-src-5.2.0-alpha/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qtscript-opensource-src-5.2.0-alpha/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ---- qtscript-opensource-src-5.2.0-alpha/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 2013-11-25 10:57:19.094713069 -0500 -+++ qtscript-opensource-src-5.2.0-alpha/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2013-11-25 11:02:20.624715931 -0500 +diff -up qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +--- qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 2013-11-26 19:00:28.000000000 -0600 ++++ qtscript-opensource-src-5.2.0-rc1/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2013-12-02 13:43:02.144456614 -0600 @@ -189,6 +189,18 @@ #define WTF_CPU_SPARC 1 #endif @@ -20,9 +20,9 @@ diff -up qtscript-opensource-src-5.2.0-alpha/src/3rdparty/javascriptcore/JavaScr /* CPU(X86) - i386 / x86 32-bit */ #if defined(__i386__) \ || defined(i386) \ -@@ -878,7 +890,7 @@ +@@ -898,7 +910,7 @@ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) - #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) + #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) #define WTF_USE_JSVALUE64 1 -#elif CPU(ARM) || CPU(PPC64) +#elif CPU(ARM) || CPU(PPC64) || CPU(S390X) diff --git a/sources b/sources index 193b6ff..6e86f9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5099ae2b081a3249f5c59a03397e2820 qtscript-opensource-src-5.2.0-beta1.tar.xz +574f1451af3cddb7f1839500907cc5a7 qtscript-opensource-src-5.2.0-rc1.tar.xz