From 21080977e30caf8ebdaad0f8d57300876fdab4c4 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 4 Nov 2019 13:47:52 -0500 Subject: [PATCH 1/3] always BR: python2-devel --- chromium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium.spec b/chromium.spec index d7c8d25..2439139 100644 --- a/chromium.spec +++ b/chromium.spec @@ -439,6 +439,7 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-2.0) %endif BuildRequires: /usr/bin/python2 +BuildRequires: python2-devel %if 0%{?bundlepylibs} # Using bundled bits, do nothing. %else @@ -456,7 +457,6 @@ BuildRequires: python-markupsafe BuildRequires: python-ply %endif BuildRequires: python2-simplejson -BuildRequires: python2-devel %endif %if 0%{?bundlere2} # Using bundled bits, do nothing. From 06fe4fb881e91d27f7d73711f237727d2100ae69 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 6 Nov 2019 12:04:18 -0500 Subject: [PATCH 2/3] use minizip-compat-devel on epel8 too --- chromium.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/chromium.spec b/chromium.spec index 2439139..a6c53a5 100644 --- a/chromium.spec +++ b/chromium.spec @@ -344,11 +344,19 @@ BuildRequires: libusb-devel BuildRequires: libXdamage-devel BuildRequires: libXScrnSaver-devel BuildRequires: libXtst-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 %else +# RHEL 8 needs to use the compat-minizip (provided by minizip1.2) +%if 0%{?rhel} >= 8 +BuildRequires: minizip-compat-devel +%else +# RHEL 7 and older uses the old minizip BuildRequires: minizip-devel %endif +%endif # RHEL 7's nodejs is too old %if 0%{?rhel} == 7 # Use bundled. From 978a69928b542f3b5c16fcf1fd332487d67c0255 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 7 Nov 2019 09:05:09 -0500 Subject: [PATCH 3/3] update to 78.0.3904.97 --- chromium.spec | 5 ++++- sources | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/chromium.spec b/chromium.spec index a6c53a5..b2af49f 100644 --- a/chromium.spec +++ b/chromium.spec @@ -167,7 +167,7 @@ Name: chromium%{chromium_channel}%{nsuffix} %else Name: chromium%{chromium_channel} %endif -Version: %{majorversion}.0.3904.87 +Version: %{majorversion}.0.3904.97 Release: 1%{?dist} %if %{?freeworld} %if %{?shared} @@ -1726,6 +1726,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Thu Nov 7 2019 Tom Callaway - 78.0.3904.97-1 +- update to 78.0.3904.97 + * Fri Nov 1 2019 Tom Callaway - 78.0.3904.87-1 - update to 78.0.3904.87 - apply most of the freeworld changes in PR 23/24/25 diff --git a/sources b/sources index 5687005..3900065 100644 --- a/sources +++ b/sources @@ -18,3 +18,4 @@ SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb874 SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd SHA512 (node-v8.9.1-linux-x64.tar.gz) = a707fd4567041c56e7f9d415e505e3fa650627f31def7fefdd7ec50f9e7066bb33332b67f479e1159d85e1105a7e6d034aad7429f4f3d034c9161170d7e0b844 SHA512 (chromium-78.0.3904.87-clean.tar.xz) = ebd2a1440c36e9272b52b11ddfa596ce3d7b7a3a914970ebd4ce98d5bb862625ab61c392a9ea277ae8f791185d98d84ff5797db77bb80fa305b847e549035893 +SHA512 (chromium-78.0.3904.97-clean.tar.xz) = 5872fec9533726e031d41086b008f616a936818ee341ac6818081450b123874cc4dbd20e29afbd4b45acb79a6fb4d2b240b394804d23539c26eedca76d8d2124