diff --git a/.gitignore b/.gitignore index 4c6e54e..53a1369 100644 --- a/.gitignore +++ b/.gitignore @@ -214,3 +214,6 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2 /thunderbird-langpacks-60.2.1-20181003.tar.xz /l10n-lightning-60.2.1.tar.xz /lightning-langpacks-60.2.1.tar.xz +/thunderbird-60.3.0.source.tar.xz +/thunderbird-langpacks-60.3.0-20181030.tar.xz +/lightning-langpacks-60.3.0.tar.xz diff --git a/build-triplet-failure.patch b/build-triplet-failure.patch deleted file mode 100644 index 068d27c..0000000 --- a/build-triplet-failure.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up thunderbird-60.0/build/moz.configure/init.configure.triplet-failure thunderbird-60.0/build/moz.configure/init.configure ---- thunderbird-60.0/build/moz.configure/init.configure.triplet-failure 2018-10-02 14:13:04.276835572 +0200 -+++ thunderbird-60.0/build/moz.configure/init.configure 2018-10-02 14:13:18.921865210 +0200 -@@ -577,7 +577,13 @@ def split_triplet(triplet, allow_unknown - # There is also a quartet form: - # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM - # But we can consider the "KERNEL-OPERATING_SYSTEM" as one. -- cpu, manufacturer, os = triplet.split('-', 2) -+ parts = triplet.split('-', 2) -+ if len(parts) == 3: -+ cpu, _, os = parts -+ elif len(parts) == 2: -+ cpu, os = parts -+ else: -+ die("Unexpected triplet string: %s" % triplet) - - # Autoconf uses config.sub to validate and canonicalize those triplets, - # but the granularity of its results has never been satisfying to our diff --git a/sources b/sources index 1569963..62ce96c 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -SHA512 (thunderbird-60.2.1.source.tar.xz) = d74da3c90658c5baf09c22760cad31594524c09f2cd5aba81c5b15bb6db64d78f613562cb015d8a725b4902caa4a57a2d1dafce28284533747faed00f8268a02 -SHA512 (thunderbird-langpacks-60.2.1-20181003.tar.xz) = c8ac34e9d8f8bd996b9a17f59dc4266f3c5b9c283f6d1fdc693ed3d64dc8fc43992304b07b7941c026c350351da85700ef99c6b2550c3530582db4b262c2a563 -SHA512 (l10n-lightning-60.2.1.tar.xz) = 1c686cf889908792d979fd2a2811da8e82f2eef4ff27b1430c2842aaa2c50996b52c52fe5b2504ff419fc0b3e9791f453be14a02640f633210eef7c39e83c4ab -SHA512 (lightning-langpacks-60.2.1.tar.xz) = 9b9edaba374d7fae103b42b2ca2add51807846ae93c57221407cd72818c78f5adeb70deef2a6bb3de54eccc99eba10e2a0f793e5c6e923328e5efc8a8497dedb +SHA512 (thunderbird-60.3.0.source.tar.xz) = 6cc390129dd2ce30c4685748bc5cdbf07c1326bf1ba4727d34b105f800ee3d0c7344a1bda3b8f6a666f635eb6d2fba7da5afb1222aac05a536d2dd77afb3a8d3 +SHA512 (thunderbird-langpacks-60.3.0-20181030.tar.xz) = 61e8a37ea8c17636f55b52d76bcdef412061dfa494a4d3e7dce6bbc7a699995f277912595f367c2146c231742147df6c7334a7a3d26e143a1cae24f02cd8bd41 +SHA512 (lightning-langpacks-60.3.0.tar.xz) = 5cf4fe7d75124210726536eeb39c774b831ef0c8edbca0afd1ffcc6ed622704535fb063718b1af88e77cbe52b20d5d45b8283b7131051363bb387cbe3dddfe0f diff --git a/thunderbird.spec b/thunderbird.spec index edec5f5..779dfbf 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -88,14 +88,14 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 60.2.1 -Release: 2%{?dist} +Version: 60.3.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.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20181003.tar.xz +Source1: thunderbird-langpacks-%{version}-20181030.tar.xz # Locales for lightning Source2: lightning-langpacks-%{version}.tar.xz %endif @@ -125,7 +125,6 @@ Patch304: mozilla-1245783.patch Patch305: build-big-endian.patch Patch306: mozilla-1353817.patch Patch307: build-disable-elfhack.patch -Patch308: build-triplet-failure.patch Patch309: mozilla-1460871-ldap-query.patch # Fedora specific patches @@ -238,7 +237,6 @@ debug %{name}, you want to install %{name}-debuginfo instead. %patch104 -p1 -b .gcc6 %patch304 -p1 -b .1245783 -%patch308 -p1 -b .triplet-failure %patch309 -p1 -b .1460871-ldap-query # Patch for big endian platforms only %if 0%{?big_endian} @@ -686,6 +684,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Tue Oct 30 2018 Jan Horak - 60.3.0-1 +- Update to 60.3.0 + * Wed Oct 3 2018 Jan Horak - 60.2.1-2 - Update to 60.2.1 - Added fix for rhbz#1546988