- 3.1 beta 2

4 files changed, 8 insertions, 66 deletions

diff --git a/.cvsignore b/.cvsignore
index 6dba77d..bc78652 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-firefox-3.1b1-source.tar.bz2
+firefox-3.1b2-source.tar.bz2
diff --git a/firefox.spec b/firefox.spec
index 65bf73a..3ac8a48 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,5 +1,4 @@
 %define homepage http://start.fedoraproject.org/
-%define firstrun http://fedoraproject.org/static/firefox/
 %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define desktop_file_utils_version 0.9
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
@@ -7,7 +6,7 @@
 %define mozappdir            %{_libdir}/%{name}-%{internal_version}
 
 %define gecko_version 1.9.1
-%define internal_version 3.1b1
+%define internal_version 3.1b2
 
 %define official_branding    0
 %define build_langpacks      0
@@ -20,14 +19,14 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.1
-Release:        0.3.beta1%{?dist}
+Release:        0.4.beta2%{?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-3.1b1-source.tar.bz2
+%define tarball firefox-3.1b2-source.tar.bz2
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
@@ -48,7 +47,6 @@ Source100:      find-external-requires
 
 %if %{official_branding}
 # Required by Mozilla Corporation
-Patch10:        mozilla-firstrun.patch
 
 
 %else
@@ -100,7 +98,6 @@ cd mozilla-central
 
 %if %{official_branding}
 # Required by Mozilla Corporation
-%patch10 -p1 -b .firstrun
 
 %else
 # Not yet approved by Mozilla Corporation
@@ -174,12 +171,6 @@ desktop-file-install --vendor mozilla \
 # set up our default preferences
 %{__cat} %{SOURCE12} | %{__sed} -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > rh-default-prefs
 
-# set up our default homepage
-%{__cat} >> rh-default-prefs << EOF
-pref("startup.homepage_override_url", "%{firstrun}");
-pref("startup.homepage_welcome_url", "%{firstrun}");
-EOF
-
 # resolves bug #461880
 %{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/browserconfig.properties << EOF
 browser.startup.homepage=%{homepage}
@@ -237,8 +228,6 @@ for langpack in `ls firefox-langpacks/*.xpi`; do
   unzip $jarfile -d $langtmp
 
   sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \
-         -e "s|startup.homepage_override_url.*$|startup.homepage_override_url=%{firstrun}|g;" \
-         -e "s|startup.homepage_welcome_url.*$|startup.homepage_welcome_url=%{firstrun}|g;" \
          $langtmp/locale/browser-region/region.properties
 
   find $langtmp -type f | xargs chmod 644
@@ -337,6 +326,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Sat Dec 20 2008 Christopher Aillon <caillon@redhat.com> 3.1-0.4
+- 3.1 beta 2
+
 * Tue Dec  9 2008 Christopher Aillon <caillon@redhat.com> 3.1-0.3
 - Rebuild
 
diff --git a/mozilla-firstrun.patch b/mozilla-firstrun.patch
deleted file mode 100644
index b26acae..0000000
--- a/mozilla-firstrun.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -up mozilla/browser/base/jar.mn.firstrun mozilla/browser/base/jar.mn
---- mozilla/browser/base/jar.mn.firstrun	2008-06-15 12:39:28.000000000 -0700
-+++ mozilla/browser/base/jar.mn	2008-06-15 12:39:34.000000000 -0700
-@@ -21,9 +21,6 @@ browser.jar:
- *       content/browser/browser.js                    (content/browser.js)
- *       content/browser/browser.xul                   (content/browser.xul)
- *       content/browser/credits.xhtml                 (content/credits.xhtml)
--*       content/browser/EULA.js                       (content/EULA.js)
--*       content/browser/EULA.xhtml                    (content/EULA.xhtml)
--*       content/browser/EULA.xul                      (content/EULA.xul)
- *       content/browser/metaData.js                   (content/metaData.js)
- *       content/browser/metaData.xul                  (content/metaData.xul)
- *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
-diff -up mozilla/browser/components/nsBrowserGlue.js.firstrun mozilla/browser/components/nsBrowserGlue.js
---- mozilla/browser/components/nsBrowserGlue.js.firstrun	2008-06-15 11:28:29.000000000 -0700
-+++ mozilla/browser/components/nsBrowserGlue.js	2008-06-15 11:28:36.000000000 -0700
-@@ -175,33 +175,6 @@ BrowserGlue.prototype = {
-   // profile startup handler (contains profile initialization routines)
-   _onProfileStartup: function() 
-   {
--    // Check to see if the EULA must be shown on startup
--
--    var prefBranch = Cc["@mozilla.org/preferences-service;1"].
--                     getService(Ci.nsIPrefBranch);
--    var mustDisplayEULA = false;
--    try {
--      mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA.override");
--    } catch (e) {
--      // Pref might not exist
--    }
--
--    // Make sure it hasn't already been accepted
--    if (mustDisplayEULA) {
--      try {
--        var EULAVersion = prefBranch.getIntPref("browser.EULA.version");
--        mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA." + EULAVersion + ".accepted");
--      } catch(ex) {
--      }
--    }
--
--    if (mustDisplayEULA) {
--      var ww2 = Cc["@mozilla.org/embedcomp/window-watcher;1"].
--                getService(Ci.nsIWindowWatcher);
--      ww2.openWindow(null, "chrome://browser/content/EULA.xul", 
--                     "_blank", "chrome,centerscreen,modal,resizable=yes", null);
--    }
--
-     this.Sanitizer.onStartup();
-     // check if we're in safe mode
-     var app = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo).
diff --git a/sources b/sources
index 2fc9476..8bb428a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d101c02c8ad670eeb2095e449c79c085  firefox-3.1b1-source.tar.bz2
+961168576de81960630013f22f3e61c0  firefox-3.1b2-source.tar.bz2