rpms/firefox/F-10 firefox.spec, 1.316, 1.317 mozilla-firstrun.patch, 1.2, NONE
Christopher Aillon
caillon at fedoraproject.org
Wed Dec 17 18:36:04 UTC 2008
Author: caillon
Update of /cvs/extras/rpms/firefox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1065
Modified Files:
firefox.spec
Removed Files:
mozilla-firstrun.patch
Log Message:
* Tue Dec 16 2008 Christopher Aillon <caillon at redhat.com> 3.0.5-1
- Upstream now has an acceptable first run behavior, so use that instead of ours.
Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-10/firefox.spec,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- firefox.spec 17 Dec 2008 04:35:19 -0000 1.316
+++ firefox.spec 17 Dec 2008 18:35:34 -0000 1.317
@@ -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\}
@@ -46,7 +45,6 @@
%if %{official_branding}
# Required by Mozilla Corporation
-Patch10: mozilla-firstrun.patch
%else
@@ -97,7 +95,6 @@
%if %{official_branding}
# Required by Mozilla Corporation
-%patch10 -p1 -b .firstrun
%else
# Not yet approved by Mozilla Corporation
@@ -174,10 +171,6 @@
%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/browserconfig.properties << EOF
browser.startup.homepage=%{homepage}
EOF
-%{__cat} >> rh-default-prefs << EOF
-pref("startup.homepage_override_url", "%{firstrun}");
-pref("startup.homepage_welcome_url", "%{firstrun}");
-EOF
# Export correct locale
%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences/firefox-l10n.js << EOF
@@ -231,8 +224,6 @@
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
--- mozilla-firstrun.patch DELETED ---
More information about the fedora-extras-commits
mailing list