diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 7a68c1e..29272ed 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Feb 4 09:32:50 UTC 2011 - wr@rosenauer.org
+
+- update to version 4.0b11
+ * loads of bugfixes compared to last beta
+ * added "Do Not Track" option
+- rebased patches
+- disable testpilot
+
-------------------------------------------------------------------
Fri Jan 28 08:56:12 UTC 2011 - wr@rosenauer.org
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index a0156a0..9513295 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -1,5 +1,5 @@
#
-# spec file for package MozillaFirefox
+# spec file for package MozillaFirefox (Version 4.0b11)
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# 2006-2011 Wolfgang Rosenauer
@@ -24,22 +24,22 @@
Name: MozillaFirefox
%define use_xulrunner 1
%define xulrunner mozilla-xulrunner20
-BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files yasm zip
+BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip fdupes Mesa-devel yasm
%if %suse_version > 1110
BuildRequires: libiw-devel
%else
BuildRequires: wireless-tools
%endif
%if 0%{?use_xulrunner}
-BuildRequires: %{xulrunner}-devel = 2.0b10
+BuildRequires: %{xulrunner}-devel = 2.0b11
%endif
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version: %{mainver}b10
-Release: 2
+Version: %{mainver}b11
+Release: 1
Provides: web_browser
Provides: firefox = %{version}-%{release}
Provides: firefox = %{mainver}
-%define releasedate 2011012100
+%define releasedate 2011020300
Summary: Mozilla Firefox Web Browser
Url: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers
@@ -121,7 +121,6 @@ Requires: perl(Archive::Zip)
Development files for Firefox to make packaging of addons easier.
%if %localize
-
%package translations-common
Summary: Common translations for MozillaFirefox
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
@@ -221,7 +220,7 @@ ac_add_options --disable-installer
ac_add_options --disable-updater
ac_add_options --disable-tests
ac_add_options --disable-debug
-ac_add_options --enable-update-channel=beta
+#ac_add_options --enable-update-channel=beta
EOF
%if 0%{?use_xulrunner}
cat << EOF >> $MOZCONFIG
@@ -250,6 +249,7 @@ make -C browser/installer STRIP=/bin/true
# copy tree into RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{progdir}
cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT%{progdir}
+mkdir -p $RPM_BUILD_ROOT/%{progdir}/distribution/extensions
# remove some executable permissions
find $RPM_BUILD_ROOT%{progdir} \
-name "*.js" -o -name "*.jsm" -o -name "*.rdf" | xargs chmod a-x
@@ -445,7 +445,6 @@ exit 0
%config /etc/rpm/macros.%{progname}
%if %localize
-
%files translations-common -f %{_tmppath}/translations.common
%defattr(-,root,root)
%dir %{progdir}
diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2
index d17a059..95be61b 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:ce16a17951d11c7e2f71295d2157bb2c629be8bacdcf5647009882853c1278ca
-size 23437
+oid sha256:db282188bae64bd1060c156f869f98eb76112355e7e1bca928cad7a5c6720f5c
+size 23409
diff --git a/firefox-4.0b10-source.tar.bz2 b/firefox-4.0b10-source.tar.bz2
deleted file mode 100644
index 0f35377..0000000
--- a/firefox-4.0b10-source.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2755ab185e80436ba03a3a225d86f0bc8f0293de583b665635c8b7294732f2b1
-size 64278065
diff --git a/firefox-4.0b11-source.tar.bz2 b/firefox-4.0b11-source.tar.bz2
new file mode 100644
index 0000000..288d86e
--- /dev/null
+++ b/firefox-4.0b11-source.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8facb4e8f3886e2b8f0b4f26b00c55fd811ff0d887bcb7016c58b85a1d53f804
+size 65120526
diff --git a/firefox-browser-css.patch b/firefox-browser-css.patch
index 9cb64d8..0ed5492 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
-@@ -811,16 +811,30 @@ toolbar[iconsize="small"] #fullscreen-bu
- -moz-margin-end: 3px;
+@@ -990,16 +990,30 @@ toolbar[iconsize="small"] #feed-button {
}
- #PopupAutoComplete,
- #PopupAutoCompleteRichResult {
- direction: ltr !important;
+ .urlbar-over-link-host-label,
+ .urlbar-over-link-path-label {
+ padding: 0;
+ margin: 0;
}
+#PopupAutoCompleteRichResult .autocomplete-richlistitem {
@@ -32,11 +32,11 @@ diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gno
+ color: -moz-Fieldtext !important;
+}
+
- #PopupAutoComplete:-moz-locale-dir(rtl) > tree > treerows {
- direction: rtl;
- }
-
- #PopupAutoComplete .autocomplete-treebody {
- direction: ltr;
+ /* Favicon */
+ #page-proxy-favicon,
+ #urlbar-throbber {
+ width: 16px;
+ height: 16px;
}
+ #page-proxy-stack {
diff --git a/firefox-kde.patch b/firefox-kde.patch
index 56feb81..81e70f1 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,1062 @@
+@@ -0,0 +1,1066 @@
+#filter substitution
+
+# -*- Mode: HTML -*-
@@ -597,7 +597,9 @@ new file mode 100644
+
+
+
-+
++
++
++
+
+
+
++
+
+
+
@@ -1018,7 +1021,8 @@ new file mode 100644
+ mode="icons" iconsize="small" defaulticonsize="small"
+ lockiconsize="true"
+ defaultset="addonbar-closebutton,spring,status-bar"
-+ customizable="true">
++ customizable="true"
++ key="key_toggleAddonBar">
+
@@ -1089,10 +1093,10 @@ new file mode 100644
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
-@@ -20,16 +20,18 @@ browser.jar:
- * content/browser/aboutHome.xhtml (content/aboutHome.xhtml)
- * content/browser/aboutHome.js (content/aboutHome.js)
+@@ -22,16 +22,18 @@ browser.jar:
* content/browser/aboutHome.css (content/aboutHome.css)
+ content/browser/aboutHome-restore-icon.png (content/aboutHome-restore-icon.png)
+ content/browser/aboutHome-restore-icon-rtl.png (content/aboutHome-restore-icon-rtl.png)
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
* content/browser/browser.css (content/browser.css)
diff --git a/l10n-4.0b10.tar.bz2 b/l10n-4.0b10.tar.bz2
deleted file mode 100644
index 6f9d5cb..0000000
--- a/l10n-4.0b10.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:50830c01fa3cec2e14d832abc311cd4499b97f617c62431b54552c9a7a7ea557
-size 39774011
diff --git a/l10n-4.0b11.tar.bz2 b/l10n-4.0b11.tar.bz2
new file mode 100644
index 0000000..6cfc810
--- /dev/null
+++ b/l10n-4.0b11.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b04fa2c083c29bbce95570b96027c0b1c2181dc4a219e4526277bada01f81a18
+size 39763501