- Fix some rpmlint warnings

- Drop some old patches and obsoletes

firefox-1.5-pango-mathml.patch

@@ -1,42 +0,0 @@
---- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.mathml	2006-02-23 16:01:42.000000000 -0500
-+++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	2006-08-22 20:06:40.000000000 -0400
-@@ -829,30 +829,27 @@ nsFontMetricsPango::GetBoundingMetrics(c
-         goto loser;
-     }
- 
--    pango_layout_set_text(layout, text, strlen(text));
-+    pango_layout_set_text(layout, text, -1);
-     FixupSpaceWidths(layout, text);
- 
--    // Get the logical extents
-     PangoLayoutLine *line;
-     if (pango_layout_get_line_count(layout) != 1) {
-         printf("Warning: more than one line!\n");
-     }
-     line = pango_layout_get_line(layout, 0);
- 
--    // Get the ink extents
--    PangoRectangle rect;
--    pango_layout_line_get_extents(line, NULL, &rect);
-+    // Get the ink and logical extents
-+    PangoRectangle ink, logical;
-+    pango_layout_line_get_extents(line, &ink, &logical);
- 
-     float P2T;
-     P2T = mDeviceContext->DevUnitsToAppUnits();
- 
--    aBoundingMetrics.leftBearing =
--        NSToCoordRound(rect.x * P2T / PANGO_SCALE);
--    aBoundingMetrics.rightBearing =
--        NSToCoordRound(rect.width * P2T / PANGO_SCALE);
--    aBoundingMetrics.width = NSToCoordRound((rect.x + rect.width) * P2T / PANGO_SCALE);
--    aBoundingMetrics.ascent = NSToCoordRound(rect.y * P2T / PANGO_SCALE);
--    aBoundingMetrics.descent = NSToCoordRound(rect.height * P2T / PANGO_SCALE);
-+    aBoundingMetrics.leftBearing  = NSToCoordRound(PANGO_LBEARING(ink) * P2T / PANGO_SCALE);
-+    aBoundingMetrics.rightBearing = NSToCoordRound(PANGO_RBEARING(ink) * P2T / PANGO_SCALE);
-+    aBoundingMetrics.ascent       = NSToCoordRound(PANGO_ASCENT(ink)   * P2T / PANGO_SCALE);
-+    aBoundingMetrics.descent      = NSToCoordRound(PANGO_DESCENT(ink)  * P2T / PANGO_SCALE);
-+    aBoundingMetrics.width        = NSToCoordRound(logical.width       * P2T / PANGO_SCALE);
- 
-  loser:
-     g_free(text);

thunderbird-1.1-software-update.patch

@@ -1,27 +0,0 @@
-Index: mail/components/preferences/advanced.xul
-===================================================================
-RCS file: /cvsroot/mozilla/mail/components/preferences/advanced.xul,v
-retrieving revision 1.13.2.1
-diff -d -u -p -r1.13.2.1 advanced.xul
---- mail/components/preferences/advanced.xul	2 Sep 2005 23:29:08 -0000	1.13.2.1
-+++ mail/components/preferences/advanced.xul	15 Sep 2005 05:50:06 -0000
-@@ -66,19 +66,8 @@
-       <preference id="offline.download.download_messages"    name="offline.download.download_messages"    type="int"/>
-       <preference id="mail.prompt_purge_threshhold"          name="mail.prompt_purge_threshhold"    type="bool"/>
-       <preference id="mail.purge_threshhold"                 name="mail.purge_threshhold"    type="int"/> 
--      <preference id="app.update.enabled" name="app.update.enabled" type="bool"
--                  onchange="gAdvancedPane.updateAppUpdateItems();
--                            gAdvancedPane.updateAutoItems();
--                            gAdvancedPane.updateModeItems();"/>
--      <preference id="app.update.auto" name="app.update.auto" type="bool"
--                  onchange="gAdvancedPane.updateAutoItems(); gAdvancedPane.updateModeItems();"/>
--      <preference id="app.update.mode" name="app.update.mode" type="int"
--                  onchange="gAdvancedPane.updateModeItems();"/>
-       <preference id="extensions.update.enabled" name="extensions.update.enabled" type="bool"
-                   onchange="gAdvancedPane.updateAddonUpdateUI();"/>
--      <preference id="app.update.disable_button.showUpdateHistory"
--                  name="app.update.disable_button.showUpdateHistory"
--                  type="bool"/>
-     </preferences>
- 
-     <tabbox id="advancedPrefs" flex="1" onselect="gAdvancedPane.tabSelectionChanged();">

thunderbird.spec

@@ -8,7 +8,7 @@
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        2.0.0.9
-Release:	1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -37,7 +37,6 @@ Patch11:        thunderbird-0.7.3-gnome-uriloader.patch
 
 # customization patches
 Patch24:        thunderbird-2.0-default-applications.patch
-Patch25:        thunderbird-1.1-software-update.patch
 
 # local bugfixes
 Patch40:        firefox-1.5-bullet-bill.patch
@@ -45,7 +44,6 @@ Patch41:        firefox-2.0.0.4-undo-uriloader.patch
 Patch42:        firefox-1.1-uriloader.patch
 
 # font system fixes
-Patch82:        firefox-1.5-pango-mathml.patch
 Patch83:        firefox-1.5-pango-cursor-position.patch
 Patch84:        firefox-2.0-pango-printing.patch
 Patch85:        firefox-1.5-pango-cursor-position-more.patch
@@ -84,12 +82,10 @@ BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
 BuildRequires:  libIDL-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:	tcsh
 BuildRequires:  freetype-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
 Requires:       desktop-file-utils >= %{desktop_file_utils_version}
-Obsoletes:	MozillaThunderbird
 
 %define mozappdir %{_libdir}/thunderbird-%{version}
 
@@ -110,13 +106,11 @@ Mozilla Thunderbird is a standalone mail and newsgroup client.
 %patch10 -p1 -b .psfonts
 %patch11 -p1 -b .gnome-uriloader
 %patch24 -p1 -b .default-applications
-#%patch25 -p0 -b .software-update
 %patch40 -p1
 %patch41 -p1
 %patch42 -p0
 
 # font system fixes
-#%patch82 -p1 -b .pango-mathml
 %patch83 -p1 -b .pango-cursor-position
 %patch84 -p0 -b .pango-printing
 %patch85 -p1 -b .pango-cursor-position-more
@@ -276,9 +270,14 @@ update-desktop-database %{_datadir}/applications
 %attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop
 %attr(644,root,root) %{_datadir}/pixmaps/thunderbird.png
 %dir %{mozappdir}
-%{mozappdir}/LICENSE
+%doc %{mozappdir}/LICENSE
 %{mozappdir}/chrome
-%{mozappdir}/components
+%dir %{mozappdir}/components
+%ghost %{mozappdir}/components/compreg.dat
+%ghost %{mozappdir}/components/xpti.dat
+%{mozappdir}/components/*.so
+%{mozappdir}/components/*.xpt
+%attr(644,root,root) %{mozappdir}/components/*.js
 %{mozappdir}/defaults
 %{mozappdir}/dictionaries
 %{mozappdir}/extensions
@@ -309,6 +308,10 @@ update-desktop-database %{_datadir}/applications
 #===============================================================================
 
 %changelog
+* Sun Dec  9 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.9-2
+- Fix some rpmlint warnings
+- Drop some old patches and obsoletes
+
 * Thu Nov 15 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.9-1
 - Update to 2.0.0.9