From 22a8bcd316c0a2c85ea268467b1e82941e8585de Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon@redhat.com>
Date: Fri, 1 Apr 2011 21:46:07 -0700
Subject: [PATCH] Remove the %{thunderbird_version} define

It's no longer needed now that lightning has been dropped.
---
 thunderbird.spec | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/thunderbird.spec b/thunderbird.spec
index 231ceb8..c700738 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -5,7 +5,6 @@
 %define sqlite_version 3.6.14
 %define libnotify_version 0.4
 %define build_langpacks 1
-%define thunderbird_version 3.1.9
 %define moz_objdir objdir-tb
 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} 
 
@@ -30,7 +29,7 @@
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        %{thunderbird_version}
+Version:        3.1.9
 Release:        4%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -239,7 +238,7 @@ install -Dm755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
 %{__sed} -i -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
 
 # set up our default preferences
-%{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{thunderbird_version}-%{release},g' \
+%{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' \
                                 -e 's,COMMAND,%{mozappdir}/open-browser.sh,g' > \
         $RPM_BUILD_ROOT/rh-default-prefs
 %{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-redhat.js
@@ -308,7 +307,7 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 # Debug symbols are stored in /usr/lib even in x86_64 arch
 DEBUG_LIB_DIR=`echo %{_libdir}|sed -e "s/lib64/lib/"`
 mkdir -p $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir}
-cp objdir-tb/mozilla/dist/%{name}-%{thunderbird_version}*.crashreporter-symbols.zip $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir}
+cp objdir-tb/mozilla/dist/%{name}-%{version}*.crashreporter-symbols.zip $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir}
 %endif
 
 #===============================================================================