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

import firefox-78.12.0-1.el8_4

Browse Source
This commit is contained in:
CentOS Sources 2021-07-15 06:52:31 -04:00 committed by Andrew Lukoshko
parent 5575fdcf9e
commit 3e12bb9be9
3 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.firefox.metadata
View File

@ -1,7 +1,7 @@
18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
a9effcc06cf80eaa22f12c1f7d6aa4266a1c4966 SOURCES/cbindgen-vendor-0.14.3.tar.xz
8d5b4f10557cf7aec25edb2d3dd8b9282224ff53 SOURCES/firefox-78.11.0esr.source.tar.xz
91a31ce33cb1fb2fdea96cbc14ddc82950bb388d SOURCES/firefox-langpacks-78.11.0esr-20210531.tar.xz
83ae378d8bddd9efc5badb99a6246979313f7134 SOURCES/firefox-78.12.0esr.source.tar.xz
a469453c2e84de2a22dccdb53ab8ca997cddd127 SOURCES/firefox-langpacks-78.12.0esr-20210707.tar.xz
0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
5715f987bc0024ce5d72993cb101b8268350033b SOURCES/nodejs-10.21.0-5.fc32.src.rpm

4
.gitignore vendored
View File

@ -1,7 +1,7 @@
SOURCES/Python-2.7.13.tar.xz
SOURCES/cbindgen-vendor-0.14.3.tar.xz
SOURCES/firefox-78.11.0esr.source.tar.xz
SOURCES/firefox-langpacks-78.11.0esr-20210531.tar.xz
SOURCES/firefox-78.12.0esr.source.tar.xz
SOURCES/firefox-langpacks-78.12.0esr-20210707.tar.xz
SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
SOURCES/libffi-3.0.13-18.el7_3.src.rpm
SOURCES/nodejs-10.21.0-5.fc32.src.rpm

55
SPECS/firefox.spec
View File

@ -6,34 +6,26 @@
%global debug_package %{nil}
%endif
%global rhel_minor_version -1
%if 0%{?flatpak:1}
%global rhel_minor_version 4
%endif
%if "%{?dist}" == ".el8"
%global rhel_minor_version 5
%endif
%if "%{?dist}" == ".el8_4"
%global rhel_minor_version 4
%endif
%if "%{?dist}" == ".el8_3"
%global rhel_minor_version 3
%endif
%if "%{?dist}" == ".el8_2"
%global rhel_minor_version 2
%endif
%if "%{?dist}" == ".el8_1"
%global rhel_minor_version 1
%endif
%if "%{?dist}" == ".el8_0"
%global rhel_minor_version 0
%endif
%{lua:
function dist_to_rhel_minor(str, start)
match = string.match(str, ".module%+el8.%d+")
if match then
return string.sub(match, 13)
end
match = string.match(str, ".el8_%d+")
if match then
return string.sub(match, 6)
end
return -1
end}
%global rhel_minor_version %{lua:print(dist_to_rhel_minor(rpm.expand("%dist")))}
%global system_nss 1
%global bundle_nss 0
%if 0%{?rhel} == 8
%if 0%{?rhel_minor_version} < 2
%if %{rhel_minor_version} < 2
%global bundle_nss 1
%endif
%endif
@ -167,7 +159,7 @@
%define use_bundled_yasm 0
%if 0%{?rhel} == 8
%if 0%{?rhel_minor_version} <= 2
%if %{rhel_minor_version} <= 2
%define use_bundled_nodejs 1
%endif
%endif
@ -218,8 +210,8 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 78.11.0
Release: 3%{?dist}
Version: 78.12.0
Release: 1%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
%if 0%{?rhel} == 7
@ -231,7 +223,7 @@ ExclusiveArch: i686 x86_64 ppc64 s390x
Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20210531.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20210707.tar.xz
%endif
Source2: cbindgen-vendor-0.14.3.tar.xz
Source10: firefox-mozconfig
@ -424,7 +416,7 @@ BuildRequires: openssl-devel
%endif
%if 0%{?rhel} == 8
%if 0%{?rhel_minor_version} >= 3
%if %{rhel_minor_version} >= 3
BuildRequires: pkgconfig(libpipewire-0.3)
%else
BuildRequires: pipewire-devel
@ -606,7 +598,7 @@ https://extensions.gnome.org.
%prep
echo "Build environment"
echo "dist %{?dist}"
echo "RHEL 8 minor version: %{?rhel_minor_version}"
echo "RHEL 8 minor version: %{rhel_minor_version}"
echo "use_bundled_ffi %{?use_bundled_ffi}"
echo "use_bundled_python_2 %{?use_bundled_python_2}"
echo "use_bundled_python_3 %{?use_bundled_python_3}"
@ -652,7 +644,7 @@ sed -ie 's|/usr/include|/app/include|' %_sourcedir/firefox-pipewire-0-3.patch
%endif
%if 0%{?rhel} == 8
%if 0%{?rhel_minor_version} >= 3
%if %{rhel_minor_version} >= 3
%patch235 -p1 -b .pipewire-0-3
%else
%patch231 -p1 -b .pipewire
@ -1693,6 +1685,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Wed Jul 07 2021 Eike Rathke <erack@redhat.com> - 78.12.0-1
- Update to 78.12.0 build1
* Mon May 31 2021 Eike Rathke <erack@redhat.com> - 78.11.0-3
- Update to 78.11.0 build2 (release)