From 275bc9bdcbf207c6b7c6142e5aeb375902f07155632825b52e22497584259fd4 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Wed, 15 Aug 2018 09:38:21 +0000 Subject: [PATCH] Accepting request 629370 from home:iznogood:branches:mozilla:Factory - Add conditional for pkgconfig(gconf-2.0) BuildRequires, and pass conditional --disable-gconf to configure: no longer pull in obsolete gconf2 for Tumbleweed. OBS-URL: https://build.opensuse.org/request/show/629370 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=422 --- MozillaThunderbird.changes | 7 +++++++ MozillaThunderbird.spec | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 4f8ec78..7fcbf19 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 15 09:09:03 UTC 2018 - bjorn.lie@gmail.com + +- Add conditional for pkgconfig(gconf-2.0) BuildRequires, and pass + conditional --disable-gconf to configure: no longer pull in + obsolete gconf2 for Tumbleweed. + ------------------------------------------------------------------- Fri Aug 3 06:02:53 UTC 2018 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 05b9618..153808a 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -55,7 +55,9 @@ BuildRequires: xorg-x11-libXt-devel BuildRequires: xz BuildRequires: yasm BuildRequires: zip +%if 0%{?suse_version} < 1550 BuildRequires: pkgconfig(gconf-2.0) >= 1.2.1 +%endif BuildRequires: pkgconfig(gdk-x11-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.22 BuildRequires: pkgconfig(gobject-2.0) @@ -285,6 +287,9 @@ ac_add_options --disable-elf-hack %endif %endif ac_add_options --enable-default-toolkit=cairo-gtk3 +%if 0%{?suse_version} >= 1550 +ac_add_options --disable-gconf +%endif ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-jpeg