From df0c6ab463e6cbca3cb22ad7888c01f07a6934ba Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 29 May 2025 08:02:38 +0000 Subject: [PATCH] Import from CS git --- .firefox.metadata | 4 ++-- .gitignore | 4 ++-- SOURCES/process-official-tarball | 2 ++ SPECS/firefox.spec | 8 +++++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.firefox.metadata b/.firefox.metadata index 941ed9a..2c0b68e 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,6 +1,6 @@ 5012b69e54cbebe3b5e74011dacf3a2097f49921 SOURCES/cbindgen-vendor.tar.xz -88659f9d1ca1c4b3d2c41b7c02f22c67937b5595 SOURCES/firefox-128.10.1esr.processed-source.tar.xz -cbabfc1ddd62bfd8561c746c15e9b721b97567c8 SOURCES/firefox-langpacks-128.10.1esr-20250519.tar.xz +b39686eff2dfd96b58937b2bffa8528815b1b9df SOURCES/firefox-128.11.0esr.processed-source.tar.xz +257f57ec9a9a8204b481ea702195981918307822 SOURCES/firefox-langpacks-128.11.0esr-20250521.tar.xz 2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm f466d7213e85773e002c48897524eaf909480046 SOURCES/nss-3.101.0-7.el8_2.src.rpm diff --git a/.gitignore b/.gitignore index c5a66c1..2d4f352 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/cbindgen-vendor.tar.xz -SOURCES/firefox-128.10.1esr.processed-source.tar.xz -SOURCES/firefox-langpacks-128.10.1esr-20250519.tar.xz +SOURCES/firefox-128.11.0esr.processed-source.tar.xz +SOURCES/firefox-langpacks-128.11.0esr-20250521.tar.xz SOURCES/mochitest-python.tar.gz SOURCES/nspr-4.35.0-1.el8_1.src.rpm SOURCES/nss-3.101.0-7.el8_2.src.rpm diff --git a/SOURCES/process-official-tarball b/SOURCES/process-official-tarball index a2c456b..73cb6b4 100755 --- a/SOURCES/process-official-tarball +++ b/SOURCES/process-official-tarball @@ -20,6 +20,8 @@ rm -vf ./process-tarball-dir/*/third_party/python/pip/pip-24.0.dist-info/AUTHORS # We uses system freetype2 rm -vrf ./process-tarball-dir/*/modules/freetype2 +# We use system zlib +rm -vrf ./process-tarball-dir/*/modules/zlib processed_tarball=${1/source/processed-source} diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 4386d7a..797d529 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -166,7 +166,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 128.10.1 +Version: 128.11.0 Release: 1%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -197,7 +197,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}-20250519.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20250521.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -617,7 +617,6 @@ Provides: bundled(woff2) Provides: bundled(xsimd) Provides: bundled(xz-embedded) Provides: bundled(ycbcr) -Provides: bundled(zlib) Provides: bundled(zstd) Provides: bundled(Zycore) Provides: bundled(Zydis) @@ -1989,6 +1988,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Wed May 21 2025 Eike Rathke - 128.11.0-1 +- Update to 128.11.0 + * Mon May 19 2025 Eike Rathke - 128.10.1-1 - Update to 128.10.1