|
|
@@ -1,8 +1,8 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%define tbmajor 8.0
|
|
|
+%define tbmajor 9.0
|
|
|
#%define tbversion %{tbmajor}.10
|
|
|
%define tbversion %{tbmajor}
|
|
|
-%define tbrelease 2%{?_dist_release}
|
|
|
+%define tbrelease 1%{?_dist_release}
|
|
|
|
|
|
# The tarball is pretty inconsistent with directory structure.
|
|
|
# Sometimes there is a top level directory. That goes here.
|
|
|
@@ -14,21 +14,25 @@
|
|
|
|
|
|
%define mozappdir %{_libdir}/%{name}-%{version_internal}
|
|
|
%define moz_objdir objdir-tb
|
|
|
-%define version_internal 8.0
|
|
|
+%define version_internal 9.0
|
|
|
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
|
|
|
|
|
|
%define desktop_file_utils_version 0.6
|
|
|
%define nspr_version 4.8
|
|
|
-%define nss_version 3.12.6
|
|
|
+%define nss_version 3.13.1
|
|
|
%define cairo_version 1.6.0
|
|
|
%define freetype_version 2.1.9
|
|
|
%define sqlite_version 3.6.14
|
|
|
%define libnotify_version 0.4
|
|
|
|
|
|
+%define build_vine7 0
|
|
|
%define build_vine6 0
|
|
|
%define build_vine5 0
|
|
|
|
|
|
-%if "%{?_dist_release}" >= "vl6"
|
|
|
+%if "%{?_dist_release}" >= "vl7"
|
|
|
+%define build_vine7 1
|
|
|
+%endif
|
|
|
+%if "%{?_dist_release}" == "vl6"
|
|
|
%define build_vine6 1
|
|
|
%endif
|
|
|
%if "%{?_dist_release}" == "vl5"
|
|
|
@@ -49,6 +53,7 @@ Source0: ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{tbversion}
|
|
|
Source1: ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{tbversion}/linux-x86_64/xpi/ja.xpi
|
|
|
Source1010: mozconfig-thunderbird-vine5
|
|
|
Source1020: mozconfig-thunderbird-vine6
|
|
|
+Source1030: mozconfig-thunderbird-vine7
|
|
|
Source12: thunderbird-vine-default-prefs.js
|
|
|
Source20: thunderbird.desktop
|
|
|
Source21: thunderbird.vine.sh.in
|
|
|
@@ -73,16 +78,23 @@ Source100: find-external-requires
|
|
|
Patch0: thunderbird-version.patch
|
|
|
|
|
|
# customization patches
|
|
|
-Patch1: firefox-1.5-default-a4-paper.patch
|
|
|
+Patch1: firefox-1.5-default-a4-paper.patch
|
|
|
+
|
|
|
+# Linux specific
|
|
|
+Patch100: thunderbird-9.0-enable-addons.patch
|
|
|
|
|
|
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
BuildRequires: pango-devel
|
|
|
BuildRequires: cairo-devel >= %{cairo_version}
|
|
|
-%if %{build_vine6}
|
|
|
+%if %{build_vine7}
|
|
|
BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
BuildRequires: nss-devel >= %{nss_version}
|
|
|
BuildRequires: hunspell-devel
|
|
|
%endif
|
|
|
+%if %{build_vine6}
|
|
|
+BuildRequires: nspr-devel >= %{nspr_version}
|
|
|
+BuildRequires: hunspell-devel
|
|
|
+%endif
|
|
|
BuildRequires: pixman-devel
|
|
|
BuildRequires: libpng-devel
|
|
|
%if %{build_vine5}
|
|
|
@@ -155,11 +167,16 @@ cd -
|
|
|
%if %{build_vine6}
|
|
|
%{__cp} %{SOURCE1020} .mozconfig
|
|
|
%endif
|
|
|
+%if %{build_vine7}
|
|
|
+%{__cp} %{SOURCE1030} .mozconfig
|
|
|
+%endif
|
|
|
|
|
|
# setup unofficial branding name
|
|
|
%{__cp} %{SOURCE40} mail/branding/aurora/locales/en-US/brand.properties
|
|
|
%{__cp} %{SOURCE41} mail/branding/aurora/locales/en-US/brand.dtd
|
|
|
|
|
|
+%patch100 -p1 -b .addons
|
|
|
+
|
|
|
#===============================================================================
|
|
|
|
|
|
%build
|
|
|
@@ -330,6 +347,11 @@ fi
|
|
|
#===============================================================================
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Dec 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 9.0-1
|
|
|
+- new upstream release
|
|
|
+- add Source1030 (mozconfig-thunderbird-vine7)
|
|
|
+- add Patch100 (thunderbird-9.0-enable-addons.patch)
|
|
|
+
|
|
|
* Thu Nov 10 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 8.0-2
|
|
|
- fix %%version_internal
|
|
|
|
Takemikaduchi