From 296b3f2d51a5fd290925b27e95087349f51ad2dd Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 21 2021 07:16:41 +0000 Subject: import firefox-78.14.0-1.module+el8.4.0+12520+033622d0 --- diff --git a/.firefox.metadata b/.firefox.metadata index 7b0cc17..2ef91bc 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 -83ae378d8bddd9efc5badb99a6246979313f7134 SOURCES/firefox-78.12.0esr.source.tar.xz -a469453c2e84de2a22dccdb53ab8ca997cddd127 SOURCES/firefox-langpacks-78.12.0esr-20210707.tar.xz +95d4ca87593bc348e3c56345eee64627c648b952 SOURCES/firefox-78.14.0esr.source.tar.xz +91a32f5c1d8262758d59f7238f632dbdc6800354 SOURCES/firefox-langpacks-78.14.0esr-20210902.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 23a60dc..65297ca 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.12.0esr.source.tar.xz -SOURCES/firefox-langpacks-78.12.0esr-20210707.tar.xz +SOURCES/firefox-78.14.0esr.source.tar.xz +SOURCES/firefox-langpacks-78.14.0esr-20210902.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 ce931e9..ac4bdc5 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -128,7 +128,7 @@ end} # Build as a debug package? %global debug_build 0 -#%global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html +#%%global default_bookmarks_file %%{_datadir}/bookmarks/default-bookmarks.html # need to use full path because of flatpak where datadir is /app/share %global default_bookmarks_file /usr/share/bookmarks/default-bookmarks.html %global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} @@ -143,10 +143,10 @@ end} %global nspr_version 4.25 # NSS/NSPR quite often ends in build override, so as requirement the version # we're building against could bring us some broken dependencies from time to time. -#%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) +#%%global nspr_build_version %%(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) %global nspr_build_version %{nspr_version} %global nss_version 3.53.1 -#%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) +#%%global nss_build_version %%(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) %global nss_build_version %{nss_version} %endif @@ -214,8 +214,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 78.12.0 -Release: 2%{?dist} +Version: 78.14.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 7 @@ -227,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}-20210707.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20210902.tar.xz %endif Source2: cbindgen-vendor-0.14.3.tar.xz Source10: firefox-mozconfig @@ -1689,8 +1689,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Tue Aug 10 2021 CentOS Sources - 78.12.0-2.el8.centos -- Apply debranding changes +* Thu Sep 02 2021 Eike Rathke - 78.14.0-1 +- Update to 78.14.0 build1 + +* Thu Aug 05 2021 Eike Rathke - 78.13.0-2 +- Update to 78.13.0 build2 + +* Tue Aug 03 2021 Eike Rathke - 78.13.0-1 +- Update to 78.13.0 build1 * Fri Jul 16 2021 Jan Horak - 78.12.0-2 - Rebuild to pickup older nss