summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox-redhat-default-prefs.js1
-rw-r--r--firefox.spec25
2 files changed, 16 insertions, 10 deletions
diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js
index 71edf1e..71a6da8 100644
--- a/firefox-redhat-default-prefs.js
+++ b/firefox-redhat-default-prefs.js
@@ -12,3 +12,4 @@ pref("extensions.shownSelectionUI", true);
pref("gfx.color_management.enablev4", true);
pref("ui.SpellCheckerUnderlineStyle", 1);
pref("startup.homepage_override_url", "");
+pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=http://start.fedoraproject.org/");
diff --git a/firefox.spec b/firefox.spec
index a18aac5..0e2af26 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -11,7 +11,6 @@
# Build as a debug package?
%define debug_build 0
-%define homepage http://start.fedoraproject.org/
%define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
@@ -59,7 +58,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 23.0.1
-Release: 1%{?pre_tag}%{?dist}
+Release: 2%{?pre_tag}%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -244,11 +243,6 @@ cd %{tarballdir}
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
EOF
-# resolves bug #461880
-%{__cat} > dist/bin/browser/chrome/en-US/locale/branding/browserconfig.properties << EOF
-browser.startup.homepage=%{homepage}
-EOF
-
DESTDIR=$RPM_BUILD_ROOT make install
%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
@@ -292,9 +286,6 @@ for langpack in `ls firefox-langpacks/*.xpi`; do
unzip -qq $langpack -d $extensionID
find $extensionID -type f | xargs chmod 644
- sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \
- $extensionID/browser/chrome/$language/locale/branding/browserconfig.properties
-
cd $extensionID
zip -qq -r9mX ../${extensionID}.xpi *
cd -
@@ -356,6 +347,20 @@ sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" $RPM_BUILD_ROOT/%{
#---------------------------------------------------------------------
+%pretrans
+# Moves defaults/preferences to browser/defaults/preferences in Fedora 19+
+%if 0%{?fedora} >= 19
+if [ -L %{mozappdir}/browser/defaults/preferences ]; then
+ rm %{mozappdir}/browser/defaults/preferences
+ mkdir -p %{mozappdir}/browser/defaults/preferences
+ if [ -d %{mozappdir}/defaults/preferences ]; then
+ mv %{mozappdir}/defaults/preferences/* %{mozappdir}/browser/defaults/preferences
+ rm -f %{mozappdir}/defaults/preferences/*
+ echo "Content of this directory has been moved to %{mozappdir}/browser/defaults/preferences." > %{mozappdir}/defaults/preferences/README
+ fi
+fi
+%endif
+
%preun
# is it a final removal?
if [ $1 -eq 0 ]; then
bgstack15