From eddfb30982b12c5707718fb1dbcaf71884fab751 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 10 2021 12:30:08 +0000 Subject: import firefox-78.12.0-2.module+el8.4.0+11839+bb17394d --- diff --git a/.firefox.metadata b/.firefox.metadata index 8f267ce..7b0cc17 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -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 diff --git a/.gitignore b/.gitignore index cc1b41e..23a60dc 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index a5c0454..8a58d52 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -6,34 +6,30 @@ %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 + match = string.match(str, ".el8") + if match then + return 5 + 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 +163,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 +214,8 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 78.11.0 -Release: 3%{?dist} +Version: 78.12.0 +Release: 2%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 7 @@ -231,7 +227,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 +420,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 +602,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 +648,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,8 +1689,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Tue Jun 29 2021 CentOS Sources - 78.11.0-3.el8.centos -- Apply debranding changes +* Fri Jul 16 2021 Jan Horak - 78.12.0-2 +- Rebuild to pickup older nss + +* Wed Jul 07 2021 Eike Rathke - 78.12.0-1 +- Update to 78.12.0 build1 * Mon May 31 2021 Eike Rathke - 78.11.0-3 - Update to 78.11.0 build2 (release)