1
0

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
This commit is contained in:
Wolfgang Rosenauer 2018-08-15 09:38:21 +00:00 committed by Git OBS Bridge
parent b3d2742026
commit 275bc9bdcb
2 changed files with 12 additions and 0 deletions

View File

@ -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 Fri Aug 3 06:02:53 UTC 2018 - wr@rosenauer.org

View File

@ -55,7 +55,9 @@ BuildRequires: xorg-x11-libXt-devel
BuildRequires: xz BuildRequires: xz
BuildRequires: yasm BuildRequires: yasm
BuildRequires: zip BuildRequires: zip
%if 0%{?suse_version} < 1550
BuildRequires: pkgconfig(gconf-2.0) >= 1.2.1 BuildRequires: pkgconfig(gconf-2.0) >= 1.2.1
%endif
BuildRequires: pkgconfig(gdk-x11-2.0) BuildRequires: pkgconfig(gdk-x11-2.0)
BuildRequires: pkgconfig(glib-2.0) >= 2.22 BuildRequires: pkgconfig(glib-2.0) >= 2.22
BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-2.0)
@ -285,6 +287,9 @@ ac_add_options --disable-elf-hack
%endif %endif
%endif %endif
ac_add_options --enable-default-toolkit=cairo-gtk3 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-nspr
ac_add_options --with-system-nss ac_add_options --with-system-nss
ac_add_options --with-system-jpeg ac_add_options --with-system-jpeg