rpms/firefox/devel firefox.spec, 1.313, 1.314 firefox-2.0-getstartpage.patch, 1.1, NONE

[Jan Horak]

Author: xhorak

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10971

Modified Files:
	firefox.spec 
Removed Files:
	firefox-2.0-getstartpage.patch 
Log Message:
- Removed firefox-2.0-getstartpage.patch patch 
- Start page is set by different way



Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- firefox.spec	23 Sep 2008 23:57:06 -0000	1.313
+++ firefox.spec	13 Nov 2008 15:07:40 -0000	1.314
@@ -19,7 +19,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -42,7 +42,6 @@
 Source100:      find-external-requires
 
 
-Patch1:         firefox-2.0-getstartpage.patch
 
 # Upstream patches
 
@@ -95,8 +94,6 @@
 %setup -q -c
 cd mozilla
 
-%patch1 -p1 -b .getstartpage
-
 # For branding specific patches.
 
 %if %{official_branding}
@@ -176,11 +173,15 @@
 
 # set up our default homepage
 %{__cat} >> rh-default-prefs << EOF
-pref("browser.startup.homepage", "%{homepage}");
 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}
+EOF
+
 # Export correct locale
 %{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences/firefox-l10n.js << EOF
 pref("general.useragent.locale", "chrome://global/locale/intl.properties");
@@ -333,6 +334,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Nov 11 2008 Jan Horak <jhorak at redhat.com> 3.0.2-2
+- Removed firefox-2.0-getstartpage.patch patch 
+- Start page is set by different way
+
 * Tue Sep 23 2008 Christopher Aillon <caillon at redhat.com> 3.0.2-1
 - Update to 3.0.2
 


--- firefox-2.0-getstartpage.patch DELETED ---