summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox-redhat-default-prefs.js2
-rw-r--r--firefox.spec8
2 files changed, 2 insertions, 8 deletions
diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js
index ba4bc98..4795d6e 100644
--- a/firefox-redhat-default-prefs.js
+++ b/firefox-redhat-default-prefs.js
@@ -6,5 +6,3 @@ pref("browser.display.use_system_colors", true);
pref("browser.download.folderList", 1);
pref("browser.link.open_external", 3);
pref("browser.shell.checkDefaultBrowser", false);
-pref("general.useragent.vendor", "Fedora");
-pref("general.useragent.vendorSub", "FIREFOX_RPM_VR");
diff --git a/firefox.spec b/firefox.spec
index b6fd10f..45b6e72 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -178,8 +178,8 @@ XULRUNNER_DIR=`pkg-config --variable=libdir libxul | %{__sed} -e "s,%{_libdir},,
# Remove binary stub from xulrunner
%{__rm} -rf $RPM_BUILD_ROOT/%{mozappdir}/firefox
-# set up our default preferences
-%{__cat} %{SOURCE12} | %{__sed} -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > rh-default-prefs
+# Install our default preferences
+%{__install} -p -D -m 644 %{SOURCE12} $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences/all-redhat.js
# resolves bug #461880
%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/browserconfig.properties << EOF
@@ -192,10 +192,6 @@ pref("general.useragent.locale", "chrome://global/locale/intl.properties");
EOF
%{__chmod} 644 $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences/firefox-l10n.js
-# place the preferences
-%{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences/all-redhat.js
-%{__rm} rh-default-prefs
-
# set up our default bookmarks
%{__rm} -f $RPM_BUILD_ROOT/%{mozappdir}/defaults/profile/bookmarks.html
ln -s %{default_bookmarks_file} $RPM_BUILD_ROOT/%{mozappdir}/defaults/profile/bookmarks.html
bgstack15