From 40c97f57e7ffe8e1e199bbaf484bb84ae2c51d2a Mon Sep 17 00:00:00 2001
From: Jan Horak <xhorak@fedoraproject.org>
Date: Dec 09 2009 10:44:03 +0000
Subject: Update to 3.0


---

diff --git a/.cvsignore b/.cvsignore
index 21b3fa1..23bcc23 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,3 +8,5 @@ thunderbird-langpacks-3.0rc1-20091118.tar.bz2
 thunderbird-langpacks-3.0rc1-20091125.tar.bz2
 thunderbird-3.0rc2.source.tar.bz2
 thunderbird-langpacks-3.0rc2-20091203.tar.bz2
+thunderbird-3.0.source.tar.bz2
+thunderbird-langpacks-3.0-20091209.tar.bz2
diff --git a/sources b/sources
index b98f89a..fa86ffa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-35abdb06cb92e3ff9c62b7831136ac44  thunderbird-3.0rc2.source.tar.bz2
-c8e226a813a1fe9049d018e59d63e3ac  thunderbird-langpacks-3.0rc2-20091203.tar.bz2
+9a564ac2489b1b0f9348dc298b913f6c  thunderbird-3.0.source.tar.bz2
+1263a513f4d5e7663f3fdfc23fbf8eaf  thunderbird-langpacks-3.0-20091209.tar.bz2
diff --git a/thunderbird.spec b/thunderbird.spec
index eeecaff..1dede73 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -3,7 +3,6 @@
 %define cairo_version 1.6.0
 %define freetype_version 2.1.9
 %define sqlite_version 3.6.14
-%define version_internal 3.0rc2
 %define build_langpacks 1
 %define moz_objdir objdir-tb
 
@@ -22,18 +21,18 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        3.0
-Release:        3.13.rc2%{?dist}
+Release:        4%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
-%define tarball thunderbird-%{version_internal}.source.tar.bz2
+%define tarball thunderbird-%{version}.source.tar.bz2
 %else
 %define tarball thunderbird-3.0b2-source.tar.bz2
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version_internal}-20091203.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20091209.tar.bz2
 %endif
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
@@ -316,9 +315,9 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 
 # Add debuginfo for crash-stats.mozilla.com 
 %if %{include_debuginfo}
-cp mozilla/dist/thunderbird-%{version_internal}.en-US.linux-%{_target_cpu}-crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir}
+cp mozilla/dist/thunderbird-%{version}.en-US.linux-%{_target_cpu}-crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
-cp %{moz_objdir}/mozilla/dist/thunderbird-%{version_internal}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
+cp %{moz_objdir}/mozilla/dist/thunderbird-%{version}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
 %endif
 
 %clean
@@ -404,7 +403,10 @@ fi
 #===============================================================================
 
 %changelog
-* Thu Dec  3 2009 Jan Horak <jhorak@redhat.com> - 3.0-3.13.rc1
+* Wed Dec  9 2009 Jan Horak <jhorak@redhat.com> - 3.0-4
+- Update to 3.0
+
+* Thu Dec  3 2009 Jan Horak <jhorak@redhat.com> - 3.0-3.13.rc2
 - Update to RC2
 
 * Wed Nov 25 2009 Jan Horak <jhorak@redhat.com> - 3.0-3.12.rc1