From 0de3cf0e424acdbaf27f9d352dd4e589cb78a9ff Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 19 Apr 2012 19:25:15 -0400
Subject: [PATCH] Fix s390 build

---
 gnome-settings-daemon.spec | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 4bea437..c16e622 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:           gnome-settings-daemon
 Version:        3.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -39,10 +39,12 @@ BuildRequires:  nss-devel
 BuildRequires:  colord-devel >= 0.1.12
 BuildRequires:  lcms2-devel >= 2.2
 BuildRequires:  libXi-devel libXfixes-devel
+%ifnarch s390 s390x %{?rhel:ppc ppc64}
 BuildRequires:  libwacom-devel
+BuildRequires:  xorg-x11-drv-wacom-devel
+%endif
 BuildRequires:  systemd-devel
 BuildRequires:  libXtst-devel
-BuildRequires:  xorg-x11-drv-wacom-devel
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -151,12 +153,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_libdir}/gnome-settings-daemon-3.0/libupdates.so
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
 
+%ifnarch s390 s390x %{?rhel:ppc ppc64}
 %{_libdir}/gnome-settings-daemon-3.0/wacom.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/libgsdwacom.so
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.wacom.gschema.xml
 %{_libexecdir}/gsd-wacom-led-helper
 %{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.wacom.policy
+%endif
 
 %{_libdir}/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/libxrandr.so
@@ -197,7 +201,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %{_datadir}/dbus-1/interfaces/org.gnome.SettingsDaemonUpdates.xml
 
-
 %{_datadir}/man/man1/gnome-settings-daemon.1.gz
 
 
@@ -208,6 +211,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gnome-settings-daemon-3.0/input-device-example.sh
 
 %changelog
+* Thu Apr 19 2012 Matthias Clasen <mclasen@redhat.com> - 3.4.1-2
+- Fix build on s390 (patch by Bill Nottingham)
+
 * Mon Apr 16 2012 Richard Hughes <hughsient@gmail.com> - 3.4.1-1
 - Update to 3.4.1