[thunderbird] Update to 3.1.2

[Jan Horak]

commit cec53a351d39144d6f15d75d8e3022eb4f1cbebc
Author: Jan Horak <test at dhcp-lab-150.englab.brq.redhat.com>
Date:   Fri Aug 6 13:54:35 2010 +0200

    Update to 3.1.2

 .gitignore            |    2 ++
 sources               |    4 ++--
 thunderbird-mozconfig |    1 +
 thunderbird.spec      |   16 ++++++----------
 4 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 757f130..8eba707 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 thunderbird-3.1.1.source.tar.bz2
 thunderbird-langpacks-3.1.1-20100720.tar.bz2
+thunderbird-3.1.2.source.tar.bz2
+thunderbird-langpacks-3.1.2-20100803.tar.bz2
diff --git a/sources b/sources
index 5feae38..05d2734 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3a8479252bb9a0c534870896fc10e2ff  thunderbird-3.1.1.source.tar.bz2
-57024bdeb2267b787ba72741ceac9591  thunderbird-langpacks-3.1.1-20100720.tar.bz2
+48e80576a7af70e64d30a5162364525a  thunderbird-3.1.2.source.tar.bz2
+d8b89f7a7c7153ccb7307b83568ad827  thunderbird-langpacks-3.1.2-20100803.tar.bz2
diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index c7334ff..e338eda 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -28,6 +28,7 @@ ac_add_options --enable-canvas
 ac_add_options --enable-system-hunspell
 ac_add_options --disable-crashreporter
 ac_add_options --disable-necko-wifi
+ac_add_options --disable-updater
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
diff --git a/thunderbird.spec b/thunderbird.spec
index d6b3061..8787601 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -24,7 +24,7 @@
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        3.1.1
+Version:        3.1.2
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -37,7 +37,7 @@ Group:          Applications/Internet
 Source0:        %{tarball}
 %if %{build_langpacks}
 # Language package archive is build by RH
-Source1:        thunderbird-langpacks-%{version}-20100720.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20100803.tar.bz2
 %endif
 # Config file for compilation
 Source10:       thunderbird-mozconfig
@@ -201,8 +201,6 @@ DESTDIR=$RPM_BUILD_ROOT make install
 
 # install icons
 cd -
-%{__cp} other-licenses/branding/%{name}/mailicon16.png \
-        $RPM_BUILD_ROOT/%{mozappdir}/icons/
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
 %{__cp} other-licenses/branding/%{name}/mailicon16.png \
         $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/thunderbird.png
@@ -304,7 +302,6 @@ ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{mozappdir}/dictionaries
 touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
 touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 
-
 # Add debuginfo for crash-stats.mozilla.com 
 %if %{enable_mozilla_crashreporter}
 mkdir -p $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{mozappdir}
@@ -358,7 +355,6 @@ fi
 %{mozappdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 %dir %{mozappdir}/langpacks
 %{mozappdir}/greprefs
-%{mozappdir}/icons
 %{mozappdir}/isp
 %{mozappdir}/mozilla-xremote-client
 %{mozappdir}/open-browser.sh
@@ -366,7 +362,6 @@ fi
 %{mozappdir}/run-mozilla.sh
 %{mozappdir}/thunderbird-bin
 %{mozappdir}/thunderbird
-%{mozappdir}/updater
 %{mozappdir}/*.so
 %dir %{mozappdir}/modules
 %{mozappdir}/modules/*.jsm
@@ -377,10 +372,8 @@ fi
 %{mozappdir}/modules/activity/*.js
 %{mozappdir}/README.txt
 %{mozappdir}/platform.ini
-%{mozappdir}/updater.ini
 %{mozappdir}/application.ini
 %exclude %{mozappdir}/removed-files
-%{mozappdir}/update.locale
 %{_datadir}/icons/hicolor/16x16/apps/thunderbird.png
 %{_datadir}/icons/hicolor/22x22/apps/thunderbird.png
 %{_datadir}/icons/hicolor/24x24/apps/thunderbird.png
@@ -393,10 +386,13 @@ fi
 %{mozappdir}/Throbber-small.gif
 %endif
 
-
 #===============================================================================
 
 %changelog
+* Fri Aug  6 2010 Jan Horak <jhorak at redhat.com> - 3.1.2-1
+- Update to 3.1.2
+- Disable updater
+
 * Tue Jul 20 2010 Jan Horak <jhorak at redhat.com> - 3.1.1-1
 - Update to 3.1.1