Accepting request 136625 from home:dimstar:branches:GNOME:Factory

- Add with_ibus condition (currently set to 0), as we do not have
  a recent enough version of IBus in Factory at this moment.
  + when with_ibus is set to 1; pkconfig(ibus) BuildRequires will
    be used and --enable-ibus is being passed to configure
  + when with_ibus is set to 0, pkgconfigu(ibus) is being ignored
    and --disable-ibus is being passed to configure.

OBS-URL: https://build.opensuse.org/request/show/136625
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=161
This commit is contained in:
Dominique Leuenberger 2012-10-05 08:54:11 +00:00 committed by Git OBS Bridge
parent 29b2210bf0
commit 378728d9f1
2 changed files with 21 additions and 1 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Oct 2 16:29:27 UTC 2012 - dimstar@opensuse.org
- Add with_ibus condition (currently set to 0), as we do not have
a recent enough version of IBus in Factory at this moment.
+ when with_ibus is set to 1; pkconfig(ibus) BuildRequires will
be used and --enable-ibus is being passed to configure
+ when with_ibus is set to 0, pkgconfigu(ibus) is being ignored
and --disable-ibus is being passed to configure.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Sep 29 19:31:29 UTC 2012 - dimstar@opensuse.org Sat Sep 29 19:31:29 UTC 2012 - dimstar@opensuse.org

View File

@ -20,6 +20,9 @@
# lose ConsoleKit support (bad for sysvinit) # lose ConsoleKit support (bad for sysvinit)
%define with_systemd 0 %define with_systemd 0
# We can currently not build ibus support, as it requires ibus 1.5, which has not been released yet.
%define with_ibus 0
Name: gnome-control-center Name: gnome-control-center
Version: 3.6.0 Version: 3.6.0
Release: 0 Release: 0
@ -66,7 +69,9 @@ BuildRequires: pkgconfig(goa-backend-1.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.5.91 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.5.91
BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.5.13 BuildRequires: pkgconfig(gtk+-3.0) >= 3.5.13
%if %{with_ibus}
BuildRequires: pkgconfig(ibus-1.0) >= 1.4.99 BuildRequires: pkgconfig(ibus-1.0) >= 1.4.99
%endif
BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libgnome-menu-3.0) BuildRequires: pkgconfig(libgnome-menu-3.0)
@ -180,7 +185,12 @@ NOCONFIGURE=1 gnome-autogen.sh
--enable-systemd\ --enable-systemd\
%endif %endif
--disable-static\ --disable-static\
--disable-maintainer-mode --disable-maintainer-mode\
%if %{with_ibus}
--enable-ibus
%else
--disable-ibus
%endif
make %{?_smp_mflags} V=1 make %{?_smp_mflags} V=1
%install %install