From a99a213142d47221bcc43342465df4e5a333073d Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 17 Jul 2012 11:08:06 +0200 Subject: [PATCH] Update to 14.0 --- .gitignore | 2 ++ sources | 4 ++-- thunderbird.spec | 9 +++++---- xulrunner-prtime.patch | 10 ---------- 4 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 xulrunner-prtime.patch diff --git a/.gitignore b/.gitignore index d06b6c7..ed26a01 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,5 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2 /thunderbird-langpacks-13.0-20120605.tar.xz /thunderbird-13.0.1.source.tar.bz2 /thunderbird-langpacks-13.0.1-20120615.tar.xz +/thunderbird-14.0.source.tar.bz2 +/thunderbird-langpacks-14.0-20120717.tar.xz diff --git a/sources b/sources index 2399aa2..0cf9dc4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -721088faf4bedfd8d7beb6f8295856d1 thunderbird-13.0.1.source.tar.bz2 -21d202fb7f8896a966d5e32c2d4cfc08 thunderbird-langpacks-13.0.1-20120615.tar.xz +64dcfaa0aa47aa5fd8588090503fac9d thunderbird-14.0.source.tar.bz2 +10a06f10119440d9d507756bf001b6a0 thunderbird-langpacks-14.0-20120717.tar.xz diff --git a/thunderbird.spec b/thunderbird.spec index 8ff883b..b891951 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -39,14 +39,14 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 13.0.1 +Version: 14.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.bz2 %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20120615.tar.xz +Source1: thunderbird-langpacks-%{version}-20120717.tar.xz %endif Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded @@ -63,7 +63,6 @@ Patch8: xulrunner-10.0-secondary-ipc.patch # Build patches Patch104: xulrunner-10.0-gcc47.patch -Patch105: xulrunner-prtime.patch # Linux specific Patch200: thunderbird-8.0-enable-addons.patch @@ -152,7 +151,6 @@ cd mozilla %patch7 -p2 -b .static %patch8 -p3 -b .secondary-ipc %patch104 -p1 -b .gcc47 -%patch105 -p1 -b .prtime cd .. %patch200 -p1 -b .addons @@ -391,6 +389,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Tue Jul 17 2012 Jan Horak - 14.0-1 +- Update to 14.0 + * Fri Jun 15 2012 Jan Horak - 13.0.1-1 - Update to 13.0.1 diff --git a/xulrunner-prtime.patch b/xulrunner-prtime.patch deleted file mode 100644 index c1efe33..0000000 --- a/xulrunner-prtime.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up mozilla-release/hal/sandbox/PHal.ipdl.old mozilla-release/hal/sandbox/PHal.ipdl ---- mozilla-release/hal/sandbox/PHal.ipdl.old 2012-06-01 14:04:00.000000000 +0200 -+++ mozilla-release/hal/sandbox/PHal.ipdl 2012-06-05 09:15:02.524408100 +0200 -@@ -39,7 +39,7 @@ - include protocol PContent; - include protocol PBrowser; --include "nspr/prtime.h"; -+include "prtime.h"; - include "mozilla/HalSensor.h"; - include "mozilla/HalTypes.h";