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

AlmaLinux changes

Browse Source
This commit is contained in:
eabdullin 2022-04-08 12:21:49 +03:00
commit 9ff3c75f08
4 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.firefox.metadata
View File

@ -1,5 +1,5 @@
c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz
322e0ffb8b442f599b0f5dd695e6f83050b3dc82 SOURCES/firefox-91.4.0esr.processed-source.tar.xz 986181f538d2a6951f95b4e1a754854b8e0048ff SOURCES/firefox-91.6.0esr.processed-source.tar.xz
74a1b8c9a5f4a96f80af2d3fe542495e3af2423a SOURCES/firefox-langpacks-91.4.0esr-20211201.tar.xz ea7fce0f4ee0101b6d9ef8b4d050fe8a16becff9 SOURCES/firefox-langpacks-91.6.0esr-20220202.tar.xz
b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm

4
.gitignore vendored
View File

@ -1,5 +1,5 @@
SOURCES/cbindgen-vendor.tar.xz SOURCES/cbindgen-vendor.tar.xz
SOURCES/firefox-91.4.0esr.processed-source.tar.xz SOURCES/firefox-91.6.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-91.4.0esr-20211201.tar.xz SOURCES/firefox-langpacks-91.6.0esr-20220202.tar.xz
SOURCES/nspr-4.32.0-1.el8_1.src.rpm SOURCES/nspr-4.32.0-1.el8_1.src.rpm
SOURCES/nss-3.67.0-7.el8_1.src.rpm SOURCES/nss-3.67.0-7.el8_1.src.rpm

1
SOURCES/firefox-mozconfig
View File

@ -12,7 +12,6 @@ ac_add_options --enable-chrome-format=omni
ac_add_options --enable-pulseaudio ac_add_options --enable-pulseaudio
ac_add_options --without-system-icu ac_add_options --without-system-icu
ac_add_options --enable-release ac_add_options --enable-release
ac_add_options --update-channel=release
ac_add_options --allow-addon-sideload ac_add_options --allow-addon-sideload
ac_add_options --with-system-jpeg ac_add_options --with-system-jpeg
ac_add_options --enable-js-shell ac_add_options --enable-js-shell

39
SPECS/firefox.spec
View File

@ -129,18 +129,22 @@ end}
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 91.4.0 Version: 91.6.0
Release: 3%{?dist} Release: 2%{?dist}
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
%if 0%{?rhel} == 9 %if 0%{?rhel} == 9
ExcludeArch: %{ix86} ExcludeArch: %{ix86}
%endif %endif
%if 0%{?rhel} == 8 %if 0%{?rhel} == 8
%if %{rhel_minor_version} == 1
ExcludeArch: %{ix86} aarch64 s390x
%else
ExcludeArch: %{ix86} ExcludeArch: %{ix86}
%endif
%endif %endif
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
ExcludeArch: s390 ppc ExcludeArch: aarch64 s390 ppc
%endif %endif
# We can't use the official tarball as it contains some test files that use # We can't use the official tarball as it contains some test files that use
@ -150,7 +154,7 @@ ExcludeArch: s390 ppc
# Link to official tarball: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%%{version}%%{?pre_version}.source.tar.xz # Link to official tarball: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%%{version}%%{?pre_version}.source.tar.xz
Source0: firefox-%{version}%{?pre_version}.processed-source.tar.xz Source0: firefox-%{version}%{?pre_version}.processed-source.tar.xz
%if %{build_langpacks} %if %{build_langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20211201.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20220202.tar.xz
%endif %endif
Source2: cbindgen-vendor.tar.xz Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball Source3: process-official-tarball
@ -422,7 +426,15 @@ echo "use_rustts %{?use_rustts}"
%patch215 -p1 -b .addons %patch215 -p1 -b .addons
%patch219 -p1 -b .rhbz-1173156 %patch219 -p1 -b .rhbz-1173156
%patch224 -p1 -b .1170092 %patch224 -p1 -b .1170092
# the nss changed in 8.6 and later, so addons are working in older releases
%if 0%{?rhel_minor_version} >= 6
%patch225 -p1 -b .firefox-nss-addon-hack %patch225 -p1 -b .firefox-nss-addon-hack
%endif
%if 0%{?rhel} >= 9
%patch225 -p1 -b .firefox-nss-addon-hack
%endif
# Patch for big endian platforms only # Patch for big endian platforms only
%if 0%{?big_endian} %if 0%{?big_endian}
@ -642,7 +654,7 @@ function build_bundled_package() {
echo $PKG_CONFIG_PATH echo $PKG_CONFIG_PATH
rpm -ivh %{SOURCE403} rpm -ivh %{SOURCE403}
rpmbuild --nodeps --define '_prefix %{bundled_install_path}' -ba %{_specdir}/nss.spec rpmbuild --nodeps --define '_prefix %{bundled_install_path}' --without=tests -ba %{_specdir}/nss.spec
pushd %{_buildrootdir} pushd %{_buildrootdir}
#cleanup #cleanup
#rm -rf {_buildrootdir}/usr/lib/debug/* #rm -rf {_buildrootdir}/usr/lib/debug/*
@ -1246,8 +1258,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Mon Jan 17 2022 Eduard Abdullin <eabdullin@almalinux.org> - 91.4.0-3.alma * Fri Apr 08 2022 Eduard Abdullin <eabdullin@almalinux.org> - 91.6.0-2.alma
- Enable optimalization on s390x - Debrand for AlmaLinux
* Wed Feb 09 2022 Jan Horak <jhorak@redhat.com> - 91.6.0-2
- Enable addon installation on rhel9
* Wed Feb 02 2022 Eike Rathke <erack@redhat.com> - 91.6.0-1
- Update to 91.6.0 build1
* Wed Feb 02 2022 Jan Horak <jhorak@redhat.com> - 91.5.0-2
- Use default update channel to fix non working enterprise policies:
rhbz#2044667
* Thu Jan 06 2022 Eike Rathke <erack@redhat.com> - 91.5.0-1
- Update to 91.5.0 build1
* Wed Dec 22 2021 Jan Horak <jhorak@redhat.com> - 91.4.0-3 * Wed Dec 22 2021 Jan Horak <jhorak@redhat.com> - 91.4.0-3
- Enable optimalization on s390x - Enable optimalization on s390x