[chromium-freeworld: 137/148] merge
commit fae045bc88565a2d8616c4112550b46b293059ae
Merge: b5526c1 29aa9da
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Sat Aug 5 17:18:07 2017 -0400
merge
.gitignore | 1 +
chromium-60.0.3112.78-enable-mp3.patch | 479 ++++++++++++++++++
chromium-60.0.3112.78-fix-gn-bootstrap.patch | 11 +
chromium-60.0.3112.78-gcc7.patch | 80 +++
chromium-60.0.3112.78-gn-system.patch | 221 ++++++++
chromium-60.0.3112.78-gtk2fix.patch | 612 +++++++++++++++++++++++
chromium-60.0.3112.78-jpeg-nomangle.patch | 14 +
chromium-60.0.3112.78-last-commit-position.patch | 28 ++
chromium-60.0.3112.78-no-libpng-prefix.patch | 17 +
chromium-60.0.3112.78-no-zlib-mangle.patch | 13 +
chromium.spec | 235 ++++++---
sources | 5 +-
12 files changed, 1639 insertions(+), 77 deletions(-)
---
diff --cc chromium.spec
index 5d26a88,5ec59ba..f151408
--- a/chromium.spec
+++ b/chromium.spec
@@@ -111,11 -106,15 +106,14 @@@ BuildRequires: libicu-devel >= 5.
%global default_client_secret miEreAep8nuvTdvLums6qyLK
%global chromoting_client_id
449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com
- %global majorversion 59
+ %global majorversion 60
+ %if %{freeworld}
+ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
+ %else
Name: chromium%{chromium_channel}
- Version: %{majorversion}.0.3071.115
- Release: 5%{?dist}
-%endif
+ Version: %{majorversion}.0.3112.90
+ Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser
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)
@@@ -1741,12 -1819,16 +1818,22 @@@ getent group chrome-remote-desktop >/de
%changelog
+ * Fri Aug 4 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.90-1
+ - update to 60.0.3112.90
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
59.0.3071.115-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+ * Mon Jul 31 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.78-1
+ - update to 60.0.3112.78
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
59.0.3071.115-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+ * Fri Jul 21 2017 Tom Callaway <spot(a)fedoraproject.org> 59.0.3071.115-4
+ - put common files in -common subpackage
+ - build headless_shell for -headless subpackage
+
* Fri Jul 21 2017 Tom Callaway <spot(a)fedoraproject.org> 59.0.3071.115-3
- use posttrans to ensure that old libs are gone before trying to make alternative
symlinks