From c89e2895570800cbaac490c9c2835d92f196316f546e4bbd8ac6caffc4b5e279 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Wed, 23 Feb 2011 14:14:11 +0000 Subject: [PATCH] 4.0b12 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=193 --- MozillaFirefox.changes | 6 ++++++ MozillaFirefox.spec | 10 +++++----- compare-locales.tar.bz2 | 4 ++-- firefox-4.0b11-source.tar.bz2 | 3 --- firefox-4.0b12-source.tar.bz2 | 3 +++ firefox-browser-css.patch | 10 +++++----- firefox-kde.patch | 21 ++++++++++++++++----- firefox-shellservice.patch | 4 ++-- l10n-4.0b11.tar.bz2 | 3 --- l10n-4.0b12.tar.bz2 | 3 +++ 10 files changed, 42 insertions(+), 25 deletions(-) delete mode 100644 firefox-4.0b11-source.tar.bz2 create mode 100644 firefox-4.0b12-source.tar.bz2 delete mode 100644 l10n-4.0b11.tar.bz2 create mode 100644 l10n-4.0b12.tar.bz2 diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 29272ed..be42c13 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 23 07:52:04 UTC 2011 - wr@rosenauer.org + +- update to version 4.0b12 +- rebased patches + ------------------------------------------------------------------- Fri Feb 4 09:32:50 UTC 2011 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 9513295..395730a 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 4.0b11) +# spec file for package MozillaFirefox (Version 4.0b12) # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2011 Wolfgang Rosenauer @@ -31,15 +31,15 @@ BuildRequires: libiw-devel BuildRequires: wireless-tools %endif %if 0%{?use_xulrunner} -BuildRequires: %{xulrunner}-devel = 2.0b11 +BuildRequires: %{xulrunner}-devel = 2.0b12 %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: %{mainver}b11 +Version: %{mainver}b12 Release: 1 Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} -%define releasedate 2011020300 +%define releasedate 2011022200 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -136,7 +136,7 @@ of MozillaFirefox. %package translations-other Summary: Extra translations for MozillaFirefox License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;cy;el;en_ZA;eo;et;eu;fy_NL;ga_IE;gd;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk) +Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu) Group: System/Localization Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index 95be61b..8fc4190 100644 --- a/compare-locales.tar.bz2 +++ b/compare-locales.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db282188bae64bd1060c156f869f98eb76112355e7e1bca928cad7a5c6720f5c -size 23409 +oid sha256:95595f842ce9c2e84f948a85f323b51256bb41312a3261bd127969b701daa9c6 +size 25667 diff --git a/firefox-4.0b11-source.tar.bz2 b/firefox-4.0b11-source.tar.bz2 deleted file mode 100644 index 288d86e..0000000 --- a/firefox-4.0b11-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8facb4e8f3886e2b8f0b4f26b00c55fd811ff0d887bcb7016c58b85a1d53f804 -size 65120526 diff --git a/firefox-4.0b12-source.tar.bz2 b/firefox-4.0b12-source.tar.bz2 new file mode 100644 index 0000000..85c8943 --- /dev/null +++ b/firefox-4.0b12-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:977ad5dd5300ff28301825c82e3ee89c090f027043c726fec9b4cd181243d41b +size 65464044 diff --git a/firefox-browser-css.patch b/firefox-browser-css.patch index 0ed5492..c7d960b 100644 --- a/firefox-browser-css.patch +++ b/firefox-browser-css.patch @@ -9,13 +9,13 @@ https://bugzilla.novell.com/show_bug.cgi?id=561027 diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css --- a/browser/themes/gnomestripe/browser/browser.css +++ b/browser/themes/gnomestripe/browser/browser.css -@@ -990,16 +990,30 @@ toolbar[iconsize="small"] #feed-button { +@@ -954,16 +954,30 @@ toolbar[iconsize="small"] #feed-button { } - .urlbar-over-link-host-label, - .urlbar-over-link-path-label { - padding: 0; - margin: 0; + #urlbar-display { + margin-top: 0; + margin-bottom: 0; + color: GrayText; } +#PopupAutoCompleteRichResult .autocomplete-richlistitem { diff --git a/firefox-kde.patch b/firefox-kde.patch index 81e70f1..5c588dc 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -23,7 +23,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1066 @@ +@@ -0,0 +1,1077 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -151,7 +151,7 @@ new file mode 100644 + + ++ onpopupshowing="if (event.target == this) TabView.moveToGroupPopupShowing(event);"> +