diff --git a/SOURCES/distribution.ini b/SOURCES/distribution.ini index 8bf461e..0a0429e 100644 --- a/SOURCES/distribution.ini +++ b/SOURCES/distribution.ini @@ -1,7 +1,7 @@ [Global] id=redhat version=1.0 -about=Mozilla Firefox for Red Hat Enterprise Linux +about=Mozilla Firefox for CentOS Linux [Preferences] app.distributor=redhat diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js deleted file mode 100644 index 607a132..0000000 --- a/SOURCES/firefox-redhat-default-prefs.js +++ /dev/null @@ -1,35 +0,0 @@ -pref("app.update.auto", false); -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("general.smoothScroll", true); -pref("intl.locale.matchOS", true); -pref("toolkit.storage.synchronous", 0); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); -pref("browser.backspace_action", 2); -pref("browser.display.use_system_colors", true); -pref("browser.download.folderList", 1); -pref("browser.link.open_external", 3); -pref("browser.shell.checkDefaultBrowser", false); -pref("network.manage-offline-status", true); -pref("extensions.shownSelectionUI", true); -pref("ui.SpellCheckerUnderlineStyle", 1); -pref("startup.homepage_override_url", "http://www.redhat.com"); -pref("startup.homepage_welcome_url", "http://www.redhat.com"); -pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html"); -pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); -pref("media.gmp-gmpopenh264.provider.enabled",false); -pref("media.gmp-gmpopenh264.autoupdate",false); -pref("media.gmp-gmpopenh264.enabled",false); -pref("media.gmp-gmpopenh264.enabled",false); -pref("plugins.notifyMissingFlash", false); -/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */ -pref("browser.display.use_system_colors", false); -pref("layers.use-image-offscreen-surfaces", false); -/* Allow sending credetials to all https:// sites */ -pref("network.negotiate-auth.trusted-uris", "https://"); -pref("security.use_sqldb", false); -/* Use OS settings for UI language */ -pref("intl.locale.requested", ""); -/* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ -pref("storage.nfs_filesystem", true); \ No newline at end of file diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 82be41f..1ddb09f 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -157,7 +157,7 @@ Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox- Source1: firefox-langpacks-%{version}%{?pre_version}-20190325.tar.xz %endif Source10: firefox-mozconfig -Source12: firefox-redhat-default-prefs.js +Source12: firefox-centos-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -211,6 +211,7 @@ Patch406: mozilla-256180.patch Patch413: mozilla-1353817.patch Patch415: mozilla-1436242.patch +Patch1000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch # Debian patches %if %{?system_nss} @@ -488,6 +489,10 @@ https://extensions.gnome.org. %patch26 -p1 -b .icu %endif +%ifarch %{arm} +%patch1000 -p1 -b .mozilla-1238661 +%endif + %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig %if %{official_branding} @@ -828,8 +833,12 @@ export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" export MOZ_SERVICES_SYNC="1" export STRIP=/bin/true %if 0%{?rhel} == 8 +%ifarch %{arm} +export LLVM_CONFIG=/usr/bin/llvm-config-32 +%else export LLVM_CONFIG=/usr/bin/llvm-config-64 %endif +%endif ./mach build -v # create debuginfo for crash-stats.mozilla.com @@ -1219,6 +1228,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri May 24 2019 Pablo Greco - 60.6.1-1 +- Manual CentOS Branding + * Mon Mar 25 2019 Martin Stransky - 60.6.1-1 - Update to 60.6.1 ESR (Build 1)