rpms/firefox/F-9 mozilla-firstrun.patch, NONE, 1.1 .cvsignore, 1.80, 1.81 firefox.spec, 1.299, 1.300 sources, 1.92, 1.93
Christopher Aillon (caillon)
fedora-extras-commits at redhat.com
Tue Jun 17 19:17:02 UTC 2008
- Previous message (by thread): rpms/wine/devel wine-alsa-pulseaudio.patch, NONE, 1.1 wine-desktop-mime.patch, NONE, 1.1 .cvsignore, 1.60, 1.61 sources, 1.61, 1.62 wine.spec, 1.86, 1.87
- Next message (by thread): rpms/rkhunter/EL-5 01-rkhunter,1.2,1.3 rkhunter.spec,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caillon
Update of /cvs/extras/rpms/firefox/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7867
Modified Files:
.cvsignore firefox.spec sources
Added Files:
mozilla-firstrun.patch
Log Message:
* Tue Jun 17 2008 Christopher Aillon <caillon at redhat.com> 3.0-1
- Firefox 3 Final
mozilla-firstrun.patch:
--- NEW FILE mozilla-firstrun.patch ---
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,34 +175,6 @@ BrowserGlue.prototype = {
// profile startup handler (contains profile initialization routines)
_onProfileStartup: function()
{
- // Check to see if the EULA must be shown on startup
-
- // Global override for tinderbox machines
- var prefBranch = Cc["@mozilla.org/preferences-service;1"].
- getService(Ci.nsIPrefBranch);
- var mustDisplayEULA = true;
- 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).
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-9/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore 13 Apr 2008 05:21:09 -0000 1.80
+++ .cvsignore 17 Jun 2008 19:16:07 -0000 1.81
@@ -1,2 +1,2 @@
-firefox-3.0b5-source.tar.bz2
-firefox-langpacks-3.0b5-20080412.tar.bz2
+firefox-3.0-source.tar.bz2
+firefox-langpacks-3.0-20080617.tar.bz2
Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-9/firefox.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- firefox.spec 8 May 2008 21:59:52 -0000 1.299
+++ firefox.spec 17 Jun 2008 19:16:07 -0000 1.300
@@ -1,9 +1,10 @@
%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\}
-%define version_internal 3.0b5
+%define version_internal 3.0
%define mozappdir %{_libdir}/%{name}-%{version_internal}
%define gecko_version 1.9
@@ -14,25 +15,23 @@
%if ! %{official_branding}
%define cvsdate 20080327
%define nightly .cvs%{cvsdate}
-%else
-%define version_pre .beta5
%endif
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 3.0
-Release: 0.61%{?version_pre}%{?nightly}%{?dist}
+Release: 1%{?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_internal}-source.tar.bz2
+%define tarball firefox-%{version}-source.tar.bz2
%else
%define tarball mozilla-%{cvsdate}.tar.bz2
%endif
Source0: %{tarball}
%if %{build_langpacks}
-Source2: firefox-langpacks-%{version_internal}-20080412.tar.bz2
+Source2: firefox-langpacks-%{version}-20080417.tar.bz2
%endif
Source10: firefox-mozconfig
Source11: firefox-mozconfig-branded
@@ -44,12 +43,13 @@
Source100: find-external-requires
-Patch1: firefox-2.0-getstartpage.patch
+Patch1: firefox-2.0-getstartpage.patch
# Upstream patches
%if %{official_branding}
# Required by Mozilla Corporation
+Patch10: mozilla-firstrun.patch
%else
@@ -101,7 +101,7 @@
%if %{official_branding}
# Required by Mozilla Corporation
-
+%patch10 -p1 -b .firstrun
%else
# Not yet approved by Mozilla Corporation
@@ -177,9 +177,8 @@
# set up our default homepage
%{__cat} >> rh-default-prefs << EOF
pref("browser.startup.homepage", "%{homepage}");
-# Don't show an welcome page during first start
-pref("startup.homepage_override_url", "");
-pref("startup.homepage_welcome_url", "");
+pref("startup.homepage_override_url", "%{firstrun}");
+pref("startup.homepage_welcome_url", "%{firstrun}");
EOF
# place the preferences
@@ -209,9 +208,9 @@
%{__cp} other-licenses/branding/%{name}/default16.png \
$RPM_BUILD_ROOT/%{mozappdir}/icons/
+echo > ../%{name}.lang
%if %{build_langpacks}
# Install langpacks
-echo > ../%{name}.lang
%{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir}/extensions
%{__tar} xjf %{SOURCE2}
for langpack in `ls firefox-langpacks/*.xpi`; do
@@ -228,7 +227,8 @@
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=%{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
@@ -256,6 +256,9 @@
touch $RPM_BUILD_ROOT/%{mozappdir}/components/compreg.dat
touch $RPM_BUILD_ROOT/%{mozappdir}/components/xpti.dat
+# jemalloc shows up sometimes, but it's not needed here, it's in XR
+%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/libjemalloc.so
+
#---------------------------------------------------------------------
%clean
@@ -324,6 +327,9 @@
#---------------------------------------------------------------------
%changelog
+* Tue Jun 17 2008 Christopher Aillon <caillon at redhat.com> 3.0-1
+- Firefox 3 Final
+
* Thu May 08 2008 Colin Walters <walters at redhat.com> 3.0-0.61
- Rebuild to pick up new xulrunner (bug #445543)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-9/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- sources 13 Apr 2008 05:21:09 -0000 1.92
+++ sources 17 Jun 2008 19:16:07 -0000 1.93
@@ -1,2 +1,2 @@
-6a97a0933f8cd71b34436daa41530c29 firefox-3.0b5-source.tar.bz2
-5380390ed6ad0c26b6a4e605b55b43a9 firefox-langpacks-3.0b5-20080412.tar.bz2
+b514375509fd439e44def1e4a7873af4 firefox-3.0-source.tar.bz2
+02b007c9f5b269bb7e0b9e8fce99afc0 firefox-langpacks-3.0-20080617.tar.bz2
- Previous message (by thread): rpms/wine/devel wine-alsa-pulseaudio.patch, NONE, 1.1 wine-desktop-mime.patch, NONE, 1.1 .cvsignore, 1.60, 1.61 sources, 1.61, 1.62 wine.spec, 1.86, 1.87
- Next message (by thread): rpms/rkhunter/EL-5 01-rkhunter,1.2,1.3 rkhunter.spec,1.14,1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list