From fc6ad5487a30e9370058e81931677745e5aab15e Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Wed, 18 Oct 2023 21:04:07 +0200
Subject: [PATCH] - update to 118.0.5993.88 - cleanup the package dependencies

---
 chromium.spec | 53 ++++++++++++++++++++++-----------------------------
 sources       |  2 +-
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/chromium.spec b/chromium.spec
index 364170d3..838bc3b6 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -43,6 +43,12 @@
 # set nodejs_version
 %global nodejs_version v20.6.1
 
+%global system_nodejs 1
+# RHEL 8 needs newer nodejs
+%if 0%{?rhel} == 8
+%global system_nodejs 0
+%endif
+
 # set esbuild_version
 %global esbuild_version 0.19.2
 
@@ -248,8 +254,8 @@
 %endif
 
 Name:	chromium%{chromium_channel}
-Version: 118.0.5993.70
-Release: 2%{?dist}
+Version: 118.0.5993.88
+Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
 License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only)
@@ -415,8 +421,7 @@ Source9: chromium-browser.xml
 Source10: chrome-remote-desktop@.service
 Source11: master_preferences
 
-# RHEL 8 needs newer nodejs
-%if 0%{?rhel} == 8
+%if ! %{system_nodejs}
 Source12: https://nodejs.org/dist/%{nodejs_version}/node-%{nodejs_version}-linux-x64.tar.xz
 Source13: https://nodejs.org/dist/%{nodejs_version}/node-%{nodejs_version}-linux-arm64.tar.xz
 %endif
@@ -517,19 +522,17 @@ BuildRequires:	mesa-libgbm-devel
 
 # Old Fedora (before 30) uses the 1.2 minizip by default.
 # Newer Fedora needs to use the compat package
-%if 0%{?fedora} >= 30
-BuildRequires:	minizip-compat-devel
+# Fedora > 39 uses minizip-ng
+%if ! %{bundleminizip}
+%if 0%{?fedora} > 39 || 0%{?rhel} > 9
+# BuildRequires: minizip-ng-devel
+BuildRequires: minizip-compat-devel
 %else
-# RHEL 8 needs to use the compat-minizip (provided by minizip1.2)
-%if 0%{?rhel} >= 8
-BuildRequires:	minizip-compat-devel
+BuildRequires: minizip-compat-devel
 %endif
 %endif
 
-# RHEL 8 needs newer nodejs
-%if 0%{?rhel} == 8
-# nothing
-%else
+%if %{system_nodejs}
 BuildRequires: nodejs
 %endif
 
@@ -841,21 +844,7 @@ Chromium is an open-source web browser, powered by WebKit (Blink).
 
 %package common
 Summary: Files needed for both the headless_shell and full Chromium
-# Chromium needs an explicit Requires: minizip-compat
-# We put it here to cover headless too.
-%if 0%{?fedora} >= 30
-Requires: minizip-compat%{_isa}
-%else
-%if 0%{?rhel} == 7
-# Do nothing
-%else
-%if 0%{?rhel} == 9
-Requires: minizip1.2%{_isa}
-%else
-Requires: minizip%{_isa}
-%endif
-%endif
-%endif
+
 # -common doesn't have chrome-remote-desktop bits
 # but we need to clean it up if it gets disabled again
 # NOTE: Check obsoletes version to be sure it matches
@@ -1011,8 +1000,8 @@ udev.
 # See `man find` for how the `-exec command {} +` syntax works
 find -type f \( -iname "*.py" \) -exec sed -i '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' {} +
 
-# install nodejs
-%if 0%{?rhel} == 8
+# Add correct path for nodejs binary
+%if ! %{system_nodejs}
   pushd third_party/node/linux
 %ifarch x86_64
   tar xf %{SOURCE12}
@@ -1696,6 +1685,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %{chromium_path}/chromedriver
 
 %changelog
+* Wed Oct 18 2023 Than Ngo <than@redhat.com> - 118.0.5993.88-1
+- update to 118.0.5993.88
+- cleanup the package dependencies
+
 * Mon Oct 16 2023 Than Ngo <than@redhat.com> - 118.0.5993.70-2
 - fix tab crash with SIGTRAP when using system ffmpeg
 
diff --git a/sources b/sources
index 6fc65cdb..7b07fa9f 100644
--- a/sources
+++ b/sources
@@ -2,4 +2,4 @@ SHA512 (node-v20.6.1-linux-arm64.tar.xz) = adfcaf2c22614797fd69fb46d94c1cbf64dea
 SHA512 (node-v20.6.1-linux-x64.tar.xz) = 7e15c05041a9a50f0046266aadb2e092a5aefbec19be1c7c809471add520cb57c7df3c47d88b1888b29bf2979dca3c92adddfd965370fa2a9da4ea02186464fd
 SHA512 (linux-arm64-0.19.2.tgz) = 8a0d8fec6786fffcd6954d00820037a55d61e60762c74300df0801f8db27057562c221a063bedfb8df56af9ba80abb366336987e881782c5996e6f871abd3dc6
 SHA512 (linux-x64-0.19.2.tgz) = a31cc74c4bfa54f9b75d735a1cfc944d3b5efb7c06bfba9542da9a642ae0b2d235ea00ae84d3ad0572c406405110fe7b61377af0fd15803806ef78d20fc6f05d
-SHA512 (chromium-118.0.5993.70-clean.tar.xz) = 06338def67a8d40fe4e87a08a537968abe9ad1cb79512fea5575822138fff83a47c9d8d601885bec4fa6619ca15b8f9b63ed709dc80ead8ab2a8e43b2adc61ca
+SHA512 (chromium-118.0.5993.88-clean.tar.xz) = 57f97ca053fd0a58916432cd9476d8497bd746ec3e8a72153fdfc38529cae1df3076440bd32c88a78cefcd57d67f70696537e589b1a9c75e6043621d929da96d