From 9bb847e561dc59dfb2ff8d550d82564cad7e2db7 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 3 Jan 2024 03:04:29 +0300 Subject: [PATCH] import firefox-115.6.0-1.el8_9 --- .firefox.metadata | 4 ++-- .gitignore | 4 ++-- SPECS/firefox.spec | 13 ++++++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.firefox.metadata b/.firefox.metadata index e5440fe..804a9c5 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,6 +1,6 @@ b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz -f19b5467588701056ebbecc4e4e1e12a07be06f5 SOURCES/firefox-115.5.0esr.processed-source.tar.xz -04fd448a519fc232595fdff573e38c7d5daa1d05 SOURCES/firefox-langpacks-115.5.0esr-20231114.tar.xz +3f01e727d6f69c743a7fac6ccee8c2feb5c883ff SOURCES/firefox-115.6.0esr.processed-source.tar.xz +76e4af93eb2372f845f59693b080717beb33d793 SOURCES/firefox-langpacks-115.6.0esr-20231212.tar.xz 2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm 9555ba179bc1398fbacfa2896e45f3808d94ecd2 SOURCES/nss-3.90.0-3.el8_1.src.rpm diff --git a/.gitignore b/.gitignore index 96e2494..320e9ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/cbindgen-vendor.tar.xz -SOURCES/firefox-115.5.0esr.processed-source.tar.xz -SOURCES/firefox-langpacks-115.5.0esr-20231114.tar.xz +SOURCES/firefox-115.6.0esr.processed-source.tar.xz +SOURCES/firefox-langpacks-115.6.0esr-20231212.tar.xz SOURCES/mochitest-python.tar.gz SOURCES/nspr-4.35.0-1.el8_1.src.rpm SOURCES/nss-3.90.0-3.el8_1.src.rpm diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index ab2c799..f51ad79 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -132,7 +132,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 115.5.0 +Version: 115.6.0 Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -163,7 +163,7 @@ ExcludeArch: aarch64 s390 ppc # Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%%{version}%%{?pre_version}/source/firefox-%%{version}%%{?pre_version}.source.tar.xz Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20231114.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20231212.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -310,7 +310,7 @@ BuildRequires: rust >= %{rust_version} %if 0%{?rhel} == 9 BuildRequires: cargo -BuildRequires: clang clang-libs llvm +BuildRequires: clang clang-libs llvm llvm-devel BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: python3-devel @@ -1122,8 +1122,8 @@ echo "ac_add_options --with-google-location-service-api-keyfile=`pwd`/google-loc echo "ac_add_options --with-google-safebrowsing-api-keyfile=`pwd`/google-api-key" >> .mozconfig # May result in empty --with-libclang-path= in earlier versions. -# So far this is needed only for c8s. -%if 0%{?rhel} == 8 && %{rhel_minor_version} >= 10 +# So far this is needed only for c8s/c9s. +%if (0%{?rhel} == 8 && %{rhel_minor_version} >= 10) || (0%{?rhel} == 9 && %{rhel_minor_version} >= 4) # Clang 17 upstream's detection fails, tell it where to look. echo "ac_add_options --with-libclang-path=`llvm-config --libdir`" >> .mozconfig %endif @@ -1739,6 +1739,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Dec 12 2023 Eike Rathke - 115.6.0-1 +- Update to 115.6.0 build1 + * Tue Nov 14 2023 Eike Rathke - 115.5.0-1 - Update to 115.5.0 build1