rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

AlmaLinux changes

Browse Source
This commit is contained in:
Andrew Lukoshko 2021-09-15 09:07:23 +00:00
parent 9e1985153e
commit 14135a8233
3 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SOURCES/distribution.ini
View File

@ -1,9 +1,9 @@
[Global] [Global]
id=redhat id=almalinux
version=1.0 version=1.0
about=Mozilla Firefox for Red Hat Enterprise Linux about=Mozilla Firefox for AlmaLinux
[Preferences] [Preferences]
app.distributor=redhat app.distributor=almalinux
app.distributor.channel=redhat app.distributor.channel=almalinux
app.partner.fedora=redhat app.partner.fedora=almalinux

4
SOURCES/firefox-redhat-default-prefs.js → SOURCES/firefox-almalinux-default-prefs.js
View File

@ -14,8 +14,8 @@ pref("browser.shell.checkDefaultBrowser", false);
pref("network.manage-offline-status", true); pref("network.manage-offline-status", true);
pref("extensions.shownSelectionUI", true); pref("extensions.shownSelectionUI", true);
pref("ui.SpellCheckerUnderlineStyle", 1); pref("ui.SpellCheckerUnderlineStyle", 1);
pref("startup.homepage_override_url", "http://www.redhat.com"); pref("startup.homepage_override_url", "http://www.almalinux.org");
pref("startup.homepage_welcome_url", "http://www.redhat.com"); 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("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("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.provider.enabled",false);

21
SPECS/firefox.spec
View File

@ -25,6 +25,8 @@ end}
%global rhel_minor_version %{lua:print(dist_to_rhel_minor(rpm.expand("%dist")))} %global rhel_minor_version %{lua:print(dist_to_rhel_minor(rpm.expand("%dist")))}
%global dist %{?dist}.alma
%global system_nss 1 %global system_nss 1
%global bundle_nss 0 %global bundle_nss 0
@ -231,11 +233,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20210902.tar.xz
%endif %endif
Source2: cbindgen-vendor-0.14.3.tar.xz Source2: cbindgen-vendor-0.14.3.tar.xz
Source10: firefox-mozconfig Source10: firefox-mozconfig
%if 0%{?centos} Source12: firefox-almalinux-default-prefs.js
Source12: firefox-centos-default-prefs.js
%else
Source12: firefox-redhat-default-prefs.js
%endif
Source20: firefox.desktop Source20: firefox.desktop
Source21: firefox.sh.in Source21: firefox.sh.in
Source23: firefox.1 Source23: firefox.1
@ -309,13 +307,6 @@ Patch516: D87019-thin-vec-big-endian.diff
Patch517: mozilla-1703636-slot-fail-workaround.patch Patch517: mozilla-1703636-slot-fail-workaround.patch
Patch518: D110204-fscreen.diff 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 # RHEL6 patches
Patch600: rhel6-dbusver.patch Patch600: rhel6-dbusver.patch
Patch601: rhel6-kernel.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 %patch607 -R -p1 -b .rhel6-at-no-automount
%endif %endif
# CentOS patches
%if 0%{?centos}
%patch10000 -p1 -b .mozilla-1238661
%patch10001 -p1 -b .mozilla-1526653
%endif
%{__rm} -f .mozconfig %{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig %{__cp} %{SOURCE10} .mozconfig
%if %{official_branding} %if %{official_branding}