|
|
@@ -1,5 +1,5 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
-%define tbmajor 38.7.2
|
|
|
+%define tbmajor 45.1.1
|
|
|
#%define tbversion %{tbmajor}.10
|
|
|
%define tbversion %{tbmajor}
|
|
|
%define tbrelease 1%{?_dist_release}
|
|
|
@@ -9,8 +9,8 @@
|
|
|
#
|
|
|
# IMPORTANT: If there is no top level directory, this should be
|
|
|
# set to the cwd, ie: '.'
|
|
|
-#%define tarballdir .
|
|
|
-%define tarballdir comm-esr38
|
|
|
+%define tarballdir .
|
|
|
+#define tarballdir comm-esr38
|
|
|
|
|
|
%define mozappdir %{_libdir}/%{name}-%{version_internal}
|
|
|
%define moz_objdir objdir-tb
|
|
|
@@ -44,10 +44,10 @@ URL: http://www.mozilla.org/projects/thunderbird/
|
|
|
License: MPL
|
|
|
Group: Applications/Internet
|
|
|
|
|
|
-Source0: ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{tbversion}/source/thunderbird-%{version}.source.tar.bz2
|
|
|
+Source0: ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{tbversion}/source/thunderbird-%{version}.source.tar.xz
|
|
|
Source1: ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{tbversion}/linux-x86_64/xpi/ja.xpi
|
|
|
# from https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/6.0/source/thunderbird-6.0.source.tar.bz2
|
|
|
-Source2: thunderbird-legacy-aurora.tar.bz2
|
|
|
+Source2: thunderbird-legacy-aurora.tar.xz
|
|
|
Source12: thunderbird-vine-default-prefs.js
|
|
|
Source20: thunderbird.desktop
|
|
|
Source21: thunderbird.vine.sh.in
|
|
|
@@ -84,6 +84,7 @@ Patch100: thunderbird-38.0.1-enable-addons.patch
|
|
|
# Vine Patch
|
|
|
Patch2000: thunderbird-24.0-vine6.patch
|
|
|
Patch2001: thunderbird-31.0-client_mk_objdir.patch
|
|
|
+Patch2002: thunderbird-45.1.0-mozbuild.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
BuildRequires: pango-devel
|
|
|
@@ -154,7 +155,8 @@ Thunderbird はスタンドアローンのメールおよびニュースクラ
|
|
|
#===============================================================================
|
|
|
|
|
|
%prep
|
|
|
-%setup -q %{name}-%{version} -c
|
|
|
+#setup -q %{name}-%{version} -c
|
|
|
+%setup -q
|
|
|
cd %{tarballdir}
|
|
|
|
|
|
# Fix for version issue
|
|
|
@@ -162,7 +164,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
|
|
|
> version.patch
|
|
|
%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
|
|
|
|
|
|
-%patch1 -p1 -b .default-a4
|
|
|
+#patch1 -p1 -b .default-a4
|
|
|
|
|
|
%{__rm} -f .mozconfig
|
|
|
%if %{build_vine6}
|
|
|
@@ -173,7 +175,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
|
|
|
%endif
|
|
|
|
|
|
# setup legacy aurora branding name
|
|
|
-tar xvjf %{SOURCE2}
|
|
|
+tar xJf %{SOURCE2}
|
|
|
%{__cp} %{SOURCE40} mail/branding/aurora/locales/en-US/brand.properties
|
|
|
%{__cp} %{SOURCE41} mail/branding/aurora/locales/en-US/brand.dtd
|
|
|
%{__cp} %{SOURCE44} mail/branding/aurora/content/about-wordmark.png
|
|
|
@@ -183,6 +185,7 @@ tar xvjf %{SOURCE2}
|
|
|
%patch2000 -p1 -b .vine
|
|
|
%endif
|
|
|
%patch2001 -p1 -b .vine
|
|
|
+%patch2002 -p1 -b .vine
|
|
|
|
|
|
#===============================================================================
|
|
|
|
|
|
@@ -372,6 +375,16 @@ fi
|
|
|
#===============================================================================
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jun 12 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 45.1.1-1
|
|
|
+- new upstream release
|
|
|
+
|
|
|
+* Sun May 29 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 45.1.0-1
|
|
|
+- new upstream release
|
|
|
+- update Source2 (thunderbird-legacy-aurora.tar.xz)
|
|
|
+- update Patch0 (thunderbird-version.patch)
|
|
|
+- update Patch2002 (thunderbird-45.1.0-mozbuild.patch)
|
|
|
+- update Source1020 (mozconfig-thunderbird-vine7)
|
|
|
+
|
|
|
* Sat Apr 23 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 38.7.2-1
|
|
|
- new upstream release
|
|
|
|
Takemikaduchi