- 3.1 beta 2
This commit is contained in:
parent
24bb4ebc72
commit
8932b3cc85
@ -1 +1 @@
|
|||||||
firefox-3.1b1-source.tar.bz2
|
firefox-3.1b2-source.tar.bz2
|
||||||
|
20
firefox.spec
20
firefox.spec
@ -1,5 +1,4 @@
|
|||||||
%define homepage http://start.fedoraproject.org/
|
%define homepage http://start.fedoraproject.org/
|
||||||
%define firstrun http://fedoraproject.org/static/firefox/
|
|
||||||
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
|
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
|
||||||
%define desktop_file_utils_version 0.9
|
%define desktop_file_utils_version 0.9
|
||||||
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
|
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
|
||||||
@ -7,7 +6,7 @@
|
|||||||
%define mozappdir %{_libdir}/%{name}-%{internal_version}
|
%define mozappdir %{_libdir}/%{name}-%{internal_version}
|
||||||
|
|
||||||
%define gecko_version 1.9.1
|
%define gecko_version 1.9.1
|
||||||
%define internal_version 3.1b1
|
%define internal_version 3.1b2
|
||||||
|
|
||||||
%define official_branding 0
|
%define official_branding 0
|
||||||
%define build_langpacks 0
|
%define build_langpacks 0
|
||||||
@ -20,14 +19,14 @@
|
|||||||
Summary: Mozilla Firefox Web browser
|
Summary: Mozilla Firefox Web browser
|
||||||
Name: firefox
|
Name: firefox
|
||||||
Version: 3.1
|
Version: 3.1
|
||||||
Release: 0.3.beta1%{?dist}
|
Release: 0.4.beta2%{?dist}
|
||||||
URL: http://www.mozilla.org/projects/firefox/
|
URL: http://www.mozilla.org/projects/firefox/
|
||||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
%if %{official_branding}
|
%if %{official_branding}
|
||||||
%define tarball firefox-%{version}-source.tar.bz2
|
%define tarball firefox-%{version}-source.tar.bz2
|
||||||
%else
|
%else
|
||||||
%define tarball firefox-3.1b1-source.tar.bz2
|
%define tarball firefox-3.1b2-source.tar.bz2
|
||||||
%endif
|
%endif
|
||||||
Source0: %{tarball}
|
Source0: %{tarball}
|
||||||
%if %{build_langpacks}
|
%if %{build_langpacks}
|
||||||
@ -48,7 +47,6 @@ Source100: find-external-requires
|
|||||||
|
|
||||||
%if %{official_branding}
|
%if %{official_branding}
|
||||||
# Required by Mozilla Corporation
|
# Required by Mozilla Corporation
|
||||||
Patch10: mozilla-firstrun.patch
|
|
||||||
|
|
||||||
|
|
||||||
%else
|
%else
|
||||||
@ -100,7 +98,6 @@ cd mozilla-central
|
|||||||
|
|
||||||
%if %{official_branding}
|
%if %{official_branding}
|
||||||
# Required by Mozilla Corporation
|
# Required by Mozilla Corporation
|
||||||
%patch10 -p1 -b .firstrun
|
|
||||||
|
|
||||||
%else
|
%else
|
||||||
# Not yet approved by Mozilla Corporation
|
# Not yet approved by Mozilla Corporation
|
||||||
@ -174,12 +171,6 @@ desktop-file-install --vendor mozilla \
|
|||||||
# set up our default preferences
|
# set up our default preferences
|
||||||
%{__cat} %{SOURCE12} | %{__sed} -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > rh-default-prefs
|
%{__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
|
# resolves bug #461880
|
||||||
%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/browserconfig.properties << EOF
|
%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/browserconfig.properties << EOF
|
||||||
browser.startup.homepage=%{homepage}
|
browser.startup.homepage=%{homepage}
|
||||||
@ -237,8 +228,6 @@ for langpack in `ls firefox-langpacks/*.xpi`; do
|
|||||||
unzip $jarfile -d $langtmp
|
unzip $jarfile -d $langtmp
|
||||||
|
|
||||||
sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \
|
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
|
$langtmp/locale/browser-region/region.properties
|
||||||
|
|
||||||
find $langtmp -type f | xargs chmod 644
|
find $langtmp -type f | xargs chmod 644
|
||||||
@ -337,6 +326,9 @@ fi
|
|||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%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
|
* Tue Dec 9 2008 Christopher Aillon <caillon@redhat.com> 3.1-0.3
|
||||||
- Rebuild
|
- Rebuild
|
||||||
|
|
||||||
|
@ -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).
|
|
Loading…
Reference in New Issue
Block a user