|
|
@@ -1,7 +1,7 @@
|
|
|
# do not include minor version number in MOZILLA_FIVE_HOME
|
|
|
%define tbmajor 3.1
|
|
|
-%define tbversion %{tbmajor}
|
|
|
-%define tbrelease 2%{?_dist_release}
|
|
|
+%define tbversion %{tbmajor}.1
|
|
|
+%define tbrelease 1%{?_dist_release}
|
|
|
|
|
|
# The tarball is pretty inconsistent with directory structure.
|
|
|
# Sometimes there is a top level directory. That goes here.
|
|
|
@@ -61,12 +61,15 @@ Source100: find-external-requires
|
|
|
# locale sources
|
|
|
%define MOZ_BUILD_LOCALES "ja"
|
|
|
# get from mercurial repository with command,
|
|
|
-# hg clone http://hg.mozilla.org/releases/l10n-mozilla-1.9.2/ja l10n
|
|
|
+# mkdir l10n
|
|
|
+# hg clone http://hg.mozilla.org/releases/l10n-mozilla-1.9.2/ja l10n/ja
|
|
|
Source1000: thunderbird-%{tbversion}-ja.tar.bz2
|
|
|
|
|
|
|
|
|
# upstream patch
|
|
|
|
|
|
+# Fix for version issues
|
|
|
+Patch0: thunderbird-version.patch
|
|
|
# Fix for jemalloc
|
|
|
Patch1: mozilla-jemalloc.patch
|
|
|
# Fix for installation fail when building with dynamic linked libraries
|
|
|
@@ -118,7 +121,8 @@ BuildRequires: krb5-devel
|
|
|
BuildRequires: pango-devel
|
|
|
BuildRequires: libXt-devel
|
|
|
BuildRequires: libXrender-devel
|
|
|
-BuildRequires: hunspell-devel
|
|
|
+# hunspell is in plus category for vine
|
|
|
+#BuildRequires: hunspell-devel
|
|
|
BuildRequires: sqlite3-devel >= %{sqlite_version}
|
|
|
BuildRequires: startup-notification-devel
|
|
|
BuildRequires: desktop-file-utils
|
|
|
@@ -148,6 +152,11 @@ Thunderbird はスタンドアローンのメールおよびニュースクラ
|
|
|
%setup -q %{name}-%{version} -c -b 1000
|
|
|
cd %{tarballdir}
|
|
|
|
|
|
+# Fix for version issue
|
|
|
+sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
|
|
|
+ > version.patch
|
|
|
+%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
|
|
|
+
|
|
|
%patch1 -p0 -b .jemalloc
|
|
|
%patch2 -p1 -b .shared-error
|
|
|
%patch4 -p1 -b .protected
|
|
|
@@ -167,7 +176,7 @@ cd -
|
|
|
%endif
|
|
|
%if %{build_vineseed}
|
|
|
%{__cp} %{SOURCE1040} .mozconfig
|
|
|
-# cat not build with xulrunner (yet)
|
|
|
+# cannot build with xulrunner (yet)
|
|
|
# see tracking bugs.
|
|
|
# https://bugzilla.mozilla.org/show_bug.cgi?id=306324
|
|
|
# https://bugzilla.mozilla.org/show_bug.cgi?id=377319
|
|
|
@@ -326,6 +335,12 @@ fi
|
|
|
#===============================================================================
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Jul 21 2010 Kazutaka HARADA <kazutaka@vinelinux.org> 3.1.1-1
|
|
|
+- new upstream release with security fix
|
|
|
+- add Patch0 from fedora development: fix version issue
|
|
|
+- remove BuildRequires: hunspell-devel
|
|
|
+- update mozconfig (Source1030 & Source1040): set --disable-system-hunspell
|
|
|
+
|
|
|
* Sat Jul 03 2010 Kazutaka HARADA <kazutaka@vinelinux.org> 3.1-2
|
|
|
- add BuildRequires: alsa-lib-devel
|
|
|
- remove BuildRequires: libnotify-devel
|
kazutaka