[chromium-freeworld: 14/18] Don't require libcanberra-gtk2 GTK+ 3 build is enabled
commit 7bb0a21760b69f8f2af3386e1489d6768c16a491
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Thu Dec 14 11:57:05 2017 +0100
Don't require libcanberra-gtk2 GTK+ 3 build is enabled
But require libcanberra-gtk3. Also remove provides for bundled gtk3 as
it's not bundling one.
chromium.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index d422b33..15f464e 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -254,9 +254,6 @@ BuildRequires: fontconfig-devel
BuildRequires: GConf2-devel
BuildRequires: glib2-devel
BuildRequires: gnome-keyring-devel
-BuildRequires: gtk2-devel
-# Yes. This too.
-# BuildRequires: gtk3-devel
BuildRequires: glibc-devel
BuildRequires: gperf
BuildRequires: libatomic
@@ -353,6 +350,8 @@ BuildRequires: opus-devel
BuildRequires: perl(Switch)
%if 0%{gtk3}
BuildRequires: pkgconfig(gtk+-3.0)
+%else
+BuildRequires: pkgconfig(gtk+-2.0)
%endif
BuildRequires: pulseaudio-libs-devel
BuildRequires: python-beautifulsoup4
@@ -386,7 +385,11 @@ Requires: nss%{_isa} >= 3.26
Requires: nss-mdns%{_isa}
# GTK modules it expects to find for some reason.
+%if 0%{gtk3}
+Requires: libcanberra-gtk3%{_isa}
+%else
Requires: libcanberra-gtk2%{_isa}
+%endif
%if 0%{?fedora}
# This enables support for u2f tokens
@@ -438,7 +441,6 @@ Provides: bundled(ffmpeg) = 3.2git
Provides: bundled(fips181) = 2.2.3
Provides: bundled(fontconfig) = 2.11.0
Provides: bundled(gperftools) = svn144
-Provides: bundled(gtk3) = 3.1.4
%if 0%{?bundleharfbuzz}
Provides: bundled(harfbuzz) = 1.4.2
%endif