diff options
author | Jakub Bogusz | 2014-12-30 21:49:53 (GMT) |
---|---|---|
committer | Jakub Bogusz | 2014-12-30 21:49:53 (GMT) |
commit | 8892bc27cccf5fd42fec32e47211ea4a9f4d2efc (patch) | |
tree | d622843387f44c72200bd353742a82ebf5e515cf | |
parent | d5b6135499ffddc63cd464c9c27b5ec30bd5e99c (diff) | |
download | mozilla-thunderbird-8892bc27cccf5fd42fec32e47211ea4a9f4d2efc.zip mozilla-thunderbird-8892bc27cccf5fd42fec32e47211ea4a9f4d2efc.tar.gz |
- up to 31.3.0
-rw-r--r-- | mozilla-thunderbird.spec | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/mozilla-thunderbird.spec b/mozilla-thunderbird.spec index e67ebab..0ebb241 100644 --- a/mozilla-thunderbird.spec +++ b/mozilla-thunderbird.spec @@ -15,10 +15,10 @@ %undefine crashreporter %endif -%define nspr_ver 4.10.2 -%define nss_ver 3.16.2 +%define nspr_ver 4.10.6 +%define nss_ver 3.17.0 -%define xulrunner_ver 2:24.0 +%define xulrunner_ver 2:31.3.0 %if %{without xulrunner} # The actual sqlite version (see RHBZ#480989): @@ -28,12 +28,12 @@ Summary: Thunderbird Community Edition - email client Summary(pl.UTF-8): Thunderbird Community Edition - klient poczty Name: mozilla-thunderbird -Version: 31.2.0 +Version: 31.3.0 Release: 1 License: MPL v2.0 Group: X11/Applications/Mail Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2 -# Source0-md5: 6bb66f5cb67d573939d4e2ead6f7c7ca +# Source0-md5: 3781dfb541412c7f6b530a654b834ce5 Source2: %{name}.png Source4: %{name}.desktop Source5: %{name}.sh @@ -44,6 +44,7 @@ Patch12: %{name}-no-subshell.patch # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade Patch13: %{name}-system-virtualenv.patch Patch15: %{name}-enable-addons.patch +Patch16: %{name}-bump-nss-req.patch URL: http://www.mozilla.org/projects/thunderbird/ BuildRequires: GConf2-devel >= 1.2.1 BuildRequires: alsa-lib-devel @@ -69,15 +70,15 @@ BuildRequires: libstdc++-devel BuildRequires: mozldap-devel BuildRequires: nspr-devel >= 1:%{nspr_ver} BuildRequires: nss-devel >= 1:%{nss_ver} -BuildRequires: pango-devel >= 1:1.14.0 +BuildRequires: pango-devel >= 1:1.22.0 BuildRequires: perl-base >= 1:5.6 BuildRequires: python-virtualenv BuildRequires: pkgconfig BuildRequires: python >= 1:2.5 BuildRequires: sed >= 4.0 -BuildRequires: sqlite3-devel >= 3.7.17 +BuildRequires: sqlite3-devel >= 3.8.4.2 BuildRequires: startup-notification-devel >= 0.8 -BuildRequires: libvpx-devel >= 1.0.0 +BuildRequires: libvpx-devel >= 1.3.0 BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-libXinerama-devel BuildRequires: xorg-lib-libXt-devel @@ -85,14 +86,16 @@ BuildRequires: yasm BuildRequires: zip %if %{with xulrunner} BuildRequires: xulrunner-devel >= %{xulrunner_ver} -BuildRequires: xulrunner-devel < 2:25 +BuildRequires: xulrunner-devel < 2:32 %else Requires: glib2 >= 1:2.20 %{!?with_gtk3:Requires: gtk+2 >= 2:2.14} %{?with_gtk3:Requires: gtk+3 >= 3.0.0} +Requires: libvpx >= 1.3.0 Requires: myspell-common Requires: nspr >= 1:%{nspr_ver} Requires: nss >= 1:%{nss_ver} +Requires: pango >= 1:1.22.0 Requires: sqlite3 >= %{sqlite_build_version} %endif Requires(post): mktemp >= 1.5-18 @@ -143,7 +146,7 @@ dodające funkcjonalność kalendarza. %prep %setup -qc -mv comm-esr31 mozilla +%{__mv} comm-esr31 mozilla cd mozilla %patch6 -p1 %patch7 -p1 @@ -151,6 +154,7 @@ cd mozilla %patch12 -p1 %patch13 -p1 %patch15 -p1 +%patch16 -p2 %build cd mozilla |