| |
@@ -121,6 +121,15 @@
|
| |
%global bundleharfbuzz 0
|
| |
%endif
|
| |
|
| |
+ #Rebundle zlib as minizip-compat package is going to RIP on fedora >= 30
|
| |
+ #We got no choice as building with latest minizip fails
|
| |
+ #https://bugzilla.redhat.com/show_bug.cgi?id=1632170
|
| |
+ %if 0%{?fedora} >= 30
|
| |
+ %global bundlezlib 1
|
| |
+ %else
|
| |
+ %global bundlezlib 0
|
| |
+ %endif
|
| |
+
|
| |
### Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
|
| |
### Note: These are for Fedora use ONLY.
|
| |
### For your own distribution, please get your own set of keys.
|
| |
@@ -145,7 +154,7 @@
|
| |
Name: chromium%{chromium_channel}
|
| |
%endif
|
| |
Version: %{majorversion}.0.3497.92
|
| |
- Release: 1%{?dist}
|
| |
+ Release: 2%{?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)
|
| |
@@ -346,8 +355,8 @@
|
| |
BuildRequires: libXdamage-devel
|
| |
BuildRequires: libXScrnSaver-devel
|
| |
BuildRequires: libXtst-devel
|
| |
- %if 0%{?fedora} >= 30
|
| |
- BuildRequires: minizip-compat-devel
|
| |
+ %if 0%{?bundlezlib}
|
| |
+ # nothing
|
| |
%else
|
| |
BuildRequires: minizip-devel
|
| |
%endif
|
| |
@@ -642,8 +651,10 @@
|
| |
Provides: bundled(woff2) = 445f541996fe8376f3976d35692fd2b9a6eedf2d
|
| |
Provides: bundled(xdg-mime)
|
| |
Provides: bundled(xdg-user-dirs)
|
| |
- # Provides: bundled(zlib) = 1.2.11
|
| |
-
|
| |
+ %if 0%{?bundlezlib}
|
| |
+ #Not enabling this because I'm not so confident at this.
|
| |
+ #Provides: bundled(zlib) = 1.2.11
|
| |
+ %endif
|
| |
# For selinux scriptlet
|
| |
Requires(post): /usr/sbin/semanage
|
| |
Requires(post): /usr/sbin/restorecon
|
| |
@@ -655,8 +666,10 @@
|
| |
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}
|
| |
+ #NO! minizip-compat is going to get RIPed!
|
| |
+ %if 0%{?bundlezlib}
|
| |
+ #Requires: minizip-compat%{_isa}
|
| |
+ #Nothing
|
| |
%else
|
| |
Requires: minizip%{_isa}
|
| |
%endif
|
| |
@@ -1274,7 +1287,10 @@
|
| |
re2 \
|
| |
%endif
|
| |
yasm \
|
| |
+ %if 0%{?bundlezlib}
|
| |
+ %else
|
| |
zlib
|
| |
+ %endif
|
| |
|
| |
# fix arm gcc
|
| |
sed -i 's|arm-linux-gnueabihf-|arm-linux-gnu-|g' build/toolchain/linux/BUILD.gn
|
| |
@@ -1764,6 +1780,10 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Tue Oct 2 2018 Akarshan Biswas <akarshan.biswas@hotmail.com> - 69.0.3497.92-2
|
| |
+ - Remove minizip-compat(-devel), rhbz#1632170, rhbz#1632208
|
| |
+ - Re-bundle zlib
|
| |
+
|
| |
* Wed Sep 12 2018 Tom Callaway <spot@fedoraproject.org> - 69.0.3497.92-1
|
| |
- update to 69.0.3497.92
|
| |
|
| |
@@ -2527,4 +2547,3 @@
|
| |
|
| |
* Mon Sep 9 2013 Tomas Popela <tpopela@redhat.com> 29.0.1547.65-1
|
| |
- Initial version based on Tom Callaway's <spot@fedoraproject.org> work
|
| |
-
|
| |
hellbangerkarna
commented 5 years ago
minizip-compat package from zlib is going to get rip'ed.
Remove it and re-bundle zlib for the time being.
RHBZ:1632208/1632170