diff --git a/.cvsignore b/.cvsignore index 7041ca9..f0e1ad8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ -firefox-langpacks-2.0.0.6-20070731.tar.bz2 -firefox-2.0.0.6-source.tar.bz2 -plugin-config-1.1.tar.gz +firefox-2.0.0.10-source.tar.bz2 +firefox-langpacks-2.0.0.10-20071123.tar.bz2 diff --git a/firefox-2.0-pango-ligatures.patch b/firefox-2.0-pango-ligatures.patch index c259488..cfd1da7 100644 --- a/firefox-2.0-pango-ligatures.patch +++ b/firefox-2.0-pango-ligatures.patch @@ -134,7 +134,7 @@ // Make sure to clamp the pixel size to something reasonable so we // don't make the X server blow up. nscoord screenPixels = gdk_screen_height(); - mPointSize = PR_MIN(screenPixels * FONT_MAX_FONT_SCALE, mPointSize); + mPointSize = PR_MIN((screenPixels - 1) * FONT_MAX_FONT_SCALE, mPointSize); +#endif // enumerate over the font names passed in diff --git a/firefox-2.0-pango-printing.patch b/firefox-2.0-pango-printing.patch index bbed21e..0490892 100644 --- a/firefox-2.0-pango-printing.patch +++ b/firefox-2.0-pango-printing.patch @@ -4575,14 +4575,6 @@ Index: config/system-headers fribidi/fribidi.h FSp_fopen.h fstream.h -@@ -208,6 +209,7 @@ - gdk/gdkevents.h - gdk/gdk.h - gdk/gdkkeysyms.h -+gdk/gdkpango.h - gdk/gdkprivate.h - gdk/gdkregion.h - gdk/gdkwindow.h @@ -501,6 +503,7 @@ pango/pangofc-fontmap.h pango/pango-fontmap.h diff --git a/firefox.spec b/firefox.spec index f7708fc..25b47f7 100644 --- a/firefox.spec +++ b/firefox.spec @@ -11,7 +11,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox -Version: 2.0.0.9 +Version: 2.0.0.10 Release: 1%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -22,7 +22,7 @@ Group: Applications/Internet %define tarball firefox-2.0rc3-source.tar.bz2 %endif Source0: %{tarball} -Source2: firefox-langpacks-%{version}-20071105.tar.bz2 +Source2: firefox-langpacks-%{version}-20071123.tar.bz2 Source10: firefox-mozconfig Source11: firefox-mozconfig-branded Source12: firefox-redhat-default-prefs.js @@ -436,6 +436,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Nov 26 2007 Christopher Aillon 2.0.0.10-1 +- Update to 2.0.0.10 + * Tue Nov 5 2007 Martin Stransky 2.0.0.9-1 - updated to the latest upstream diff --git a/sources b/sources index 6e22086..b95dad4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -6a977456dc7da2934a12ba397c404fb9 firefox-2.0.0.9-source.tar.bz2 -4fba8df3e8cb5463e93399a2ac87e2b2 firefox-langpacks-2.0.0.9-20071105.tar.bz2 +5c2f13d6a27f462ec6b862dafca22e7b firefox-2.0.0.10-source.tar.bz2 +368295c3958e2f8f7e7d404b9876f43f firefox-langpacks-2.0.0.10-20071123.tar.bz2