update to 78.0.3904.87, apply most of the freeworld changes in PR 23/24/25

chromium.spec

@@ -22,12 +22,22 @@
 # We'd like to always have this on.
 %global use_vaapi 0
 
+# If we build with shared on, then chrome-remote-desktop depends on chromium libs.
+# If we build with shared off, then users cannot swap out libffmpeg (and i686 gets a lot harder to build)
+%global shared 1
+
 # NEVER EVER EVER turn this on in official builds
 %global freeworld 0
 %if %{freeworld}
 %global lsuffix freeworld
+%if 0%{?shared}
+%global nsuffix -libs-media-freeworld
+%else
+%global nsuffix -freeworld
+%endif
 %else
 %global lsuffix fedora
+%global nsuffix %{nil}
 %endif
 
 # Some people wish not to use the Fedora Google API keys. Mmkay.
@@ -67,10 +77,6 @@
 %endif
 %global __requires_exclude ^(%{privlibs})\\.so*
 
-# If we build with shared on, then chrome-remote-desktop depends on chromium libs.
-# If we build with shared off, then users cannot swap out libffmpeg (and i686 gets a lot harder to build)
-%global shared 1
-
 # AddressSanitizer mode
 # https://www.chromium.org/developers/testing/addresssanitizer
 %global asan 0
@@ -157,13 +163,23 @@ BuildRequires:  libicu-devel >= 5.4
 %global majorversion 78
 
 %if %{freeworld}
-Name:		chromium%{chromium_channel}%{?freeworld:-freeworld}
+Name:		chromium%{chromium_channel}%{nsuffix}
 %else
 Name:		chromium%{chromium_channel}
 %endif
-Version:	%{majorversion}.0.3904.70
+Version:	%{majorversion}.0.3904.87
 Release:	1%{?dist}
+%if %{?freeworld}
+%if %{?shared}
+# chromium-libs-media-freeworld
+Summary:	Chromium media libraries built with all possible codecs
+%else
+# chromium-freeworld
+Summary:	A WebKit (Blink) powered web browser built with all possible codecs
+%endif
+%else
 Summary:	A WebKit (Blink) powered web browser
+%endif
 Url:		http://www.chromium.org/Home
 License:	BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
 
@@ -529,9 +545,19 @@ Obsoletes:	chromium-v8 <= 3.25.28.18
 Provides:	webrtc = 0.2
 Obsoletes:	webrtc <= 0.1
 %if 0%{?shared}
+%if 0%{?freeworld}
+# chromium-libs-media-freeworld case
+Provides:	chromium-libs-media = %{version}-%{release}
+Provides:	chromium-libs-media%{_isa} = %{version}-%{release}
+Requires:	chromium-libs%{_isa} = %{version}
+Requires(post):		%{_sbindir}/update-alternatives
+Requires(preun):	%{_sbindir}/update-alternatives
+%else
+# chromium case with shared libs
 Requires:       chromium-libs%{_isa} = %{version}-%{release}
 # This is broken out so it can be replaced.
 Requires:	chromium-libs-media%{_isa} = %{version}-%{release}
+%endif
 # Nothing to do here. chromium-libs is real.
 %else
 Provides:	chromium-libs = %{version}-%{release}
@@ -638,8 +664,22 @@ Provides: bundled(xdg-user-dirs)
 Requires(post): /usr/sbin/semanage
 Requires(post): /usr/sbin/restorecon
 
+%if %{?freeworld}
+%if %{?shared}
+%description
+Chromium media libraries built with all possible codecs. Chromium is an
+open-source web browser, powered by WebKit (Blink). This package replaces
+the default chromium-libs-media package, which is limited in what it
+can include.
+%else
+%description
+Chromium built with all possible codecs. Chromium is an
+open-source web browser, powered by WebKit (Blink).
+%endif
+%else
 %description
 Chromium is an open-source web browser, powered by WebKit (Blink).
+%endif
 
 %package common
 Summary: Files needed for both the headless_shell and full Chromium
@@ -665,21 +705,7 @@ Requires(preun): %{_sbindir}/update-alternatives
 %description libs
 Shared libraries used by chromium (and chrome-remote-desktop).
 
-%if %{freeworld}
+%if ! %{freeworld}
-%package -n chromium-libs-media-freeworld
-Summary: Chromium media libraries built with all possible codecs
-Provides: chromium-libs-media = %{version}-%{release}
-Provides: chromium-libs-media%{_isa} = %{version}-%{release}
-Requires: chromium-libs%{_isa} = %{version}
-Requires(post): %{_sbindir}/update-alternatives
-Requires(preun): %{_sbindir}/update-alternatives
-
-%description -n chromium-libs-media-freeworld
-Chromium media libraries built with all possible codecs. Chromium is an
-open-source web browser, powered by WebKit (Blink). This package replaces
-the default chromium-libs-media package, which is limited in what it
-can include.
-%else
 %package libs-media
 Summary: Shared libraries used by the chromium media subsystem
 Requires: chromium-libs%{_isa} = %{version}
@@ -1482,6 +1508,7 @@ if st and st.type == "link" then
   os.remove(path)
 end
 
+%if %{shared}
 %if %{freeworld}
 %posttrans -n chromium-libs-media-freeworld
 %{_sbindir}/update-alternatives --install \
@@ -1517,6 +1544,7 @@ if [ $1 = 0 ]; then
     %{_libdir}/chromium-browser/libffmpeg.so.fedora
 fi
 %endif
+%endif
 
 %pre -n chrome-remote-desktop
 getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-desktop
@@ -1690,6 +1718,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 
 
 %changelog
+* Fri Nov  1 2019 Tom Callaway <spot@fedoraproject.org> - 78.0.3904.87-1
+- update to 78.0.3904.87
+- apply most of the freeworld changes in PR 23/24/25
+
 * Wed Oct 23 2019 Tom Callaway <spot@fedoraproject.org> - 78.0.3904.80-1
 - update to 78.0.3904.80
 

sources

@@ -17,5 +17,4 @@ SHA512 (Tinos-Italic.ttf) = d4f4f096110ef98a781a2a0e0d319317e5f84e650fe6f4d4f6b0
 SHA512 (Tinos-Regular.ttf) = 58085c5dac6d067d60ba2ab3220c4a0cc1efcf279cadfcfb8746a5e5fa1a6f6daa62750dc2051b3b2d8a51b4d2e9bb0f66594caf2253c0870ed9c7286fa45e8f
 SHA512 (Ahem.ttf) = aeb64b10ab9c87860714cb60b4900254b13dc52c51319256a1a3722c882026ab7c616bf628fbc2fe14e38a6003f3a481af60b52a7ed62071d28ddaf428e4e3fd
 SHA512 (node-v8.9.1-linux-x64.tar.gz) = a707fd4567041c56e7f9d415e505e3fa650627f31def7fefdd7ec50f9e7066bb33332b67f479e1159d85e1105a7e6d034aad7429f4f3d034c9161170d7e0b844
-SHA512 (chromium-77.0.3865.120-clean.tar.xz) = 018702b53bafeb5fe8a297b8efb4805419555acb80a22b9f5f5fe2a3484f838f6ffa06655229466aca5a9de7f8b0497b9d387da4a1ba2dbc7c62ec3d1d0ffbb9
+SHA512 (chromium-78.0.3904.87-clean.tar.xz) = ebd2a1440c36e9272b52b11ddfa596ce3d7b7a3a914970ebd4ce98d5bb862625ab61c392a9ea277ae8f791185d98d84ff5797db77bb80fa305b847e549035893
-SHA512 (chromium-78.0.3904.70-clean.tar.xz) = f702bc3c084a69adc81f47300d00f0b8cf46ee721dbb4986bfc5ba7fc95129172d021da0514350fe77591a209ec050307eead8e9bf309b70e46eb26d29d88509