From eecf3c79a198e599943bfe34abaef68a8fa47a9e Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Mon, 9 Aug 2021 14:21:30 +0200 Subject: [PATCH] Resolves: #1990526 Update to 78.13.0 Also silence warning: Macro expanded in comment ... --- .gitignore | 2 ++ firefox.spec | 15 +++++++++------ sources | 4 ++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 0ea2bfc..2c95793 100644 --- a/.gitignore +++ b/.gitignore @@ -271,3 +271,5 @@ /firefox-langpacks-78.12.0esr-20210707.tar.xz /firefox-78.12.0esr.source.tar.xz /firefox-78.12.0esr.processed-source.tar.xz +/firefox-langpacks-78.13.0esr-20210805.tar.xz +/firefox-78.13.0esr.processed-source.tar.xz diff --git a/firefox.spec b/firefox.spec index 4521084..5446ac9 100644 --- a/firefox.spec +++ b/firefox.spec @@ -122,7 +122,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\} @@ -137,10 +137,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 @@ -197,8 +197,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 78.12.0 -Release: 2%{?dist} +Version: 78.13.0 +Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 7 @@ -212,7 +212,7 @@ ExcludeArch: s390 ppc # 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 %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20210707.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20210805.tar.xz %endif Source2: cbindgen-vendor-0.14.3.tar.xz Source3: process-official-tarball @@ -1653,6 +1653,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Mon Aug 09 2021 Eike Rathke - 78.13.0-1 +- Update to 78.13.0 + * Fri Jul 30 2021 Tomas Popela - 78.12.0-2 - Add script to process the official tarball to comply with PELC review - Fix build with newer glibc diff --git a/sources b/sources index 0a5bf92..381959d 100644 --- a/sources +++ b/sources @@ -8,5 +8,5 @@ SHA512 (nspr-4.25.0-1.el8_0.src.rpm) = 7e39e4484b0d504e1b7f1253d7dc1f9f0d45705fb SHA512 (cbindgen-vendor-0.14.3.tar.xz) = 33c8d28547674121f690eea0d3ebac33926a39caacac787bf8ed8b346478822e74da5a4a1f57ab4df4105fa8376739a2ece888845a85bc5712aaed20e4a508bc SHA512 (nss-3.53.1-3.fc32.src.rpm) = 368849487aa8f9d602c9e5d9d7c88ebd03318aece12470283ff31744ef9eed27ef1e32031378a5a673bb06a9ebbcf5542afa13f3ad465409449c218922189acb SHA512 (nodejs-10.21.0-5.fc32.src.rpm) = 4d0c212a2609dc10e242a96f63baa8babb91e8aa6696f66f627c562c1ba30cb3632ed01991c98f48b5942fc7fd89ee34b350f41de901339b49a2c19e979593a7 -SHA512 (firefox-langpacks-78.12.0esr-20210707.tar.xz) = 2c5a88cab108bba707fd10183b2853e20450c206180a8d12f6b6f850fd35913996fb866c8736279bc4c4fd639cdb0fe7f409784be900e61d226ac9e429ce69fc -SHA512 (firefox-78.12.0esr.processed-source.tar.xz) = d4dfab99b2a234354f4b079ff352778a45ee0e5990a1d92f02a5fa50597bcabe69283ef23b4e47efdcde614ff9a7f30e6a46b0e826a88382c25b48745066b98b +SHA512 (firefox-langpacks-78.13.0esr-20210805.tar.xz) = a645f2b9c9a800c1b6f8f03a5056f374411f7ca481dcee9d7575631636e236c39f35b4833f20ca229a9aca8b0ed394cc3c0265560012313afd7e00a80576fdbb +SHA512 (firefox-78.13.0esr.processed-source.tar.xz) = 3adc159a4c43cc9b9ca3edc102f537f70fd7ed83f9704a17d313c2fcba263d81c1406f58e254d448320c07861298123e51a448817d84bc9c9d025f9f6be4c254