diff --git a/SOURCES/distribution.ini b/SOURCES/distribution.ini index 8bf461e..75e660e 100644 --- a/SOURCES/distribution.ini +++ b/SOURCES/distribution.ini @@ -1,9 +1,9 @@ [Global] -id=redhat +id=almalinux version=1.0 -about=Mozilla Firefox for Red Hat Enterprise Linux +about=Mozilla Firefox for AlmaLinux [Preferences] -app.distributor=redhat -app.distributor.channel=redhat -app.partner.fedora=redhat +app.distributor=almalinux +app.distributor.channel=almalinux +app.partner.fedora=almalinux diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-almalinux-default-prefs.js similarity index 90% rename from SOURCES/firefox-redhat-default-prefs.js rename to SOURCES/firefox-almalinux-default-prefs.js index 9ead3a2..6a2c6bf 100644 --- a/SOURCES/firefox-redhat-default-prefs.js +++ b/SOURCES/firefox-almalinux-default-prefs.js @@ -14,8 +14,8 @@ 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("startup.homepage_override_url", "http://www.almalinux.org"); +pref("startup.homepage_welcome_url", "http://www.almalinux.org"); pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/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); diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index ac4bdc5..ad7243c 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -25,6 +25,8 @@ end} %global rhel_minor_version %{lua:print(dist_to_rhel_minor(rpm.expand("%dist")))} +%global dist %{?dist}.alma + %global system_nss 1 %global bundle_nss 0 @@ -231,11 +233,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20210902.tar.xz %endif Source2: cbindgen-vendor-0.14.3.tar.xz Source10: firefox-mozconfig -%if 0%{?centos} -Source12: firefox-centos-default-prefs.js -%else -Source12: firefox-redhat-default-prefs.js -%endif +Source12: firefox-almalinux-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -309,13 +307,6 @@ Patch516: D87019-thin-vec-big-endian.diff Patch517: mozilla-1703636-slot-fail-workaround.patch Patch518: D110204-fscreen.diff - -# CentOS patches -%if 0%{?centos} -Patch10000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch -Patch10001: Bug-1526653---fix_user_vfp_armv7.patch -%endif - # RHEL6 patches Patch600: rhel6-dbusver.patch Patch601: rhel6-kernel.patch @@ -699,12 +690,6 @@ sed -ie 's|/usr/include|/app/include|' %_sourcedir/firefox-pipewire-0-3.patch %patch607 -R -p1 -b .rhel6-at-no-automount %endif -# CentOS patches -%if 0%{?centos} -%patch10000 -p1 -b .mozilla-1238661 -%patch10001 -p1 -b .mozilla-1526653 -%endif - %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig %if %{official_branding}