From 4a50547207f223ab475344969b27d102cbaba58ab7d010f01f73c13976981ffa Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 29 Sep 2013 11:51:32 +0000 Subject: [PATCH] Accepting request 201147 from home:namtrac:bugfix - Introduce with_wacom defines, set to 0 on s390{x}, otherwise 1: + Disable wacom support on s390{x}, those machines have no viable input ports. + Have pkgconfig(libwacom) BuildRequries depend on with_wacom. OBS-URL: https://build.opensuse.org/request/show/201147 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=218 --- gnome-control-center.changes | 8 ++++++++ gnome-control-center.spec | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/gnome-control-center.changes b/gnome-control-center.changes index f27877d..6fbe934 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Sep 27 15:02:06 UTC 2013 - idonmez@suse.com + +- Introduce with_wacom defines, set to 0 on s390{x}, otherwise 1: + + Disable wacom support on s390{x}, those machines have no + viable input ports. + + Have pkgconfig(libwacom) BuildRequries depend on with_wacom. + ------------------------------------------------------------------- Tue Sep 24 13:42:05 UTC 2013 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index de5adf3..b890cef 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -19,6 +19,13 @@ # Allow to enable/disable ibus, as GNOME is rather strict on new versions. %define with_ibus 1 +# Wacom input support +%ifarch s390 s390x +%define with_wacom 0 +%else +%define with_wacom 1 +%endif + Name: gnome-control-center Version: 3.10.0 Release: 0 @@ -77,7 +84,9 @@ BuildRequires: pkgconfig(libpulse) >= 2.0 BuildRequires: pkgconfig(libpulse-mainloop-glib) >= 2.0 BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libsystemd-login) +%if %{with_wacom} BuildRequires: pkgconfig(libwacom) >= 0.7 +%endif BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(mm-glib) >= 0.7 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103 @@ -190,7 +199,9 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules %suse_update_desktop_file gnome-sound-panel X-SuSE-ControlCenter-Hardware %suse_update_desktop_file gnome-universal-access-panel X-SuSE-ControlCenter-Personal %suse_update_desktop_file gnome-user-accounts-panel X-SuSE-ControlCenter-Personal +%if %{with_wacom} %suse_update_desktop_file gnome-wacom-panel X-SuSE-ControlCenter-Hardware +%endif %fdupes %{buildroot} %clean