- Update to latest trunk (20080113)

- Fix the default prefs, homepage, and useragent string

5 files changed, 18 insertions, 47 deletions

diff --git a/.cvsignore b/.cvsignore
index abec2dc..0535373 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,4 @@ firefox-20071215.tar.bz2
 firefox-langpacks-trunk-20080102.tar.bz2
 firefox-20080103.tar.bz2
 firefox-langpacks-20080103.tar.bz2
+firefox-20080113.tar.bz2
diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js
index e45332a..5d781f3 100644
--- a/firefox-redhat-default-prefs.js
+++ b/firefox-redhat-default-prefs.js
@@ -1,3 +1,4 @@
+pref("app.update.auto", false);
 pref("app.update.enabled", false);
 pref("app.update.autoInstallEnabled", false);
 pref("browser.backspace_action",            2);
diff --git a/firefox-ssl-exception.patch b/firefox-ssl-exception.patch
deleted file mode 100644
index 31ce3ab..0000000
--- a/firefox-ssl-exception.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: browser/locales/jar.mn
-===================================================================
-RCS file: /cvsroot/mozilla/browser/locales/jar.mn,v
-retrieving revision 1.73
-diff -p -u -8 -r1.73 jar.mn
---- browser/locales/jar.mn	29 Oct 2007 18:29:15 -0000	1.73
-+++ browser/locales/jar.mn	7 Jan 2008 11:51:25 -0000
-@@ -80,17 +80,20 @@
-     locale/browser/help/using_firebird.xhtml          (%chrome/help/using_firebird.xhtml)
-     locale/browser/help/customization.xhtml           (%chrome/help/customization.xhtml)
-     locale/browser/help/firefox_welcome.xhtml         (%chrome/help/firefox_welcome.xhtml)
-     locale/browser/help/download_manager.xhtml        (%chrome/help/download_manager.xhtml)
-     locale/browser/help/platformStrings.dtd           (%chrome/help/platformStrings.dtd)
-     locale/browser/help/tabbed_browsing.xhtml         (%chrome/help/tabbed_browsing.xhtml)
-     locale/browser/help/glossary.xhtml                (%chrome/help/glossary.xhtml)
- # the following files are browser-specific overrides
--*   locale/@AB_CD@/global/netError.dtd                (%chrome/overrides/netError.dtd)
--*   locale/@AB_CD@/global/appstrings.properties       (%chrome/overrides/appstrings.properties)
--*   locale/@AB_CD@/mozapps/downloads/settingsChange.dtd  (%chrome/overrides/settingsChange.dtd)
-+*   locale/browser/netError.dtd                (%chrome/overrides/netError.dtd)
-+*   locale/browser/appstrings.properties       (%chrome/overrides/appstrings.properties)
-+*   locale/browser/downloads/settingsChange.dtd  (%chrome/overrides/settingsChange.dtd)
-+% override chrome://global/locale/netErrorApp.dtd chrome://browser/locale/netError.dtd
-+% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
-+% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
- #ifdef MOZ_USE_GENERIC_BRANDING
- % locale branding @AB_CD@ %locale/branding/
-     locale/branding/brand.dtd         (%chrome/branding/brand.dtd)
-     locale/branding/brand.properties  (%chrome/branding/brand.properties)
- #endif
- #includesubst @LOCALE_SRCDIR@/extra-jar.mn
diff --git a/firefox.spec b/firefox.spec
index b429744..e9277e1 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -5,21 +5,21 @@
 %define version_internal	3.0b3pre
 %define mozappdir 		%{_libdir}/%{name}-%{version_internal}
 
-%define xulrunner_version	1.9-0.beta2.8
+%define gecko_version	1.9-0.beta2.10
 
 %define official_branding 	0
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.0
-Release:        0.beta2.9%{?dist}
+Release:        0.beta2.10.nightly20080113%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 %if %{official_branding}
 %define tarball firefox-%{version}-source.tar.bz2
 %else
-%define tarball firefox-20080103.tar.bz2
+%define tarball firefox-20080113.tar.bz2
 %endif
 Source0:        %{tarball}
 Source2:        firefox-langpacks-20080104.tar.bz2
@@ -33,10 +33,9 @@ Source23:       firefox.1
 Source50:       firefox-xremote-client.sh.in
 Source100:      find-external-requires
 
-# build patches
-Patch43:        firefox-2.0-getstartpage.patch
 
-Patch100:       firefox-ssl-exception.patch
+# other patches
+Patch43:        firefox-2.0-getstartpage.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -55,7 +54,6 @@ BuildRequires:  libIDL-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gtk2-devel
 BuildRequires:  gnome-vfs2-devel
-BuildRequires:  libgnome-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  krb5-devel
 BuildRequires:  pango-devel
@@ -64,10 +62,10 @@ BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  system-bookmarks
 BuildRequires:  startup-notification-devel
-BuildRequires:  xulrunner-devel-unstable >= %{xulrunner_version}
+BuildRequires:  gecko-devel-unstable >= %{gecko_version}
 
 Requires:       desktop-file-utils >= %{desktop_file_utils_version}
-Requires:       xulrunner >= %{xulrunner_version}
+Requires:       gecko-libs >= %{gecko_version}
 Requires:       system-bookmarks
 Obsoletes:      mozilla <= 37:1.7.13
 Provides:       webclient
@@ -87,7 +85,6 @@ compliance, performance and portability.
 
 %patch43  -p1 -b .getstartpage
 
-%patch100 -p0 -b .ssl
 
 # For branding specific patches.
 
@@ -147,9 +144,9 @@ make -f client.mk build
 
 DESTDIR=$RPM_BUILD_ROOT make install
 
-%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications,%{_datadir}/icons/hicolor/48x48/apps},
+%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications,%{_datadir}/pixmaps},
 
-%{__install} -p -D -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{__install} -p -D -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
 desktop-file-install --vendor mozilla \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -174,9 +171,8 @@ pref("startup.homepage_welcome_url", "%{homepage}");
 EOF
 
 # place the preferences
-#%{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-redhat.js
-#%{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js
-#%{__rm} rh-default-prefs
+%{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences/all-redhat.js
+%{__rm} rh-default-prefs
 
 # set up our default bookmarks
 %{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/defaults/profile/bookmarks.html
@@ -308,6 +304,10 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Sun Jan 13 2008 Christopher Aillon <caillon@redhat.com> 3.0-0.beta2.10
+- Update to latest trunk (20080113)
+- Fix the default prefs, homepage, and useragent string
+
 * Thu Jan 10 2008 Martin Stransky <stransky@redhat.com> 3.0-0.beta2.9
 - rebuilt agains xulrunner-devel-unstable
 
diff --git a/sources b/sources
index 96083d4..dfc37e3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8fd88c804672e43fd1b154205ab618ac  firefox-20080103.tar.bz2
+cca30ae88b5d7bce78900f84a5d25025  firefox-20080113.tar.bz2
 d04a2981b603b9abbc8a5e0525759c4b  firefox-langpacks-20080104.tar.bz2