From ed783361bf2b497a7577d19c2c025b44d643387f Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 17 Feb 2017 14:13:31 +0100
Subject: [PATCH] Sync RHEL conditionals

---
 gnome-settings-daemon-3.5.4-ppc-no-wacom.patch | 18 ------------------
 gnome-settings-daemon.spec                     | 14 ++------------
 2 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 gnome-settings-daemon-3.5.4-ppc-no-wacom.patch

diff --git a/gnome-settings-daemon-3.5.4-ppc-no-wacom.patch b/gnome-settings-daemon-3.5.4-ppc-no-wacom.patch
deleted file mode 100644
index 47218bd..0000000
--- a/gnome-settings-daemon-3.5.4-ppc-no-wacom.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up gnome-settings-daemon-3.5.4/configure.ac.ppc-no-wacom gnome-settings-daemon-3.5.4/configure.ac
---- gnome-settings-daemon-3.5.4/configure.ac.ppc-no-wacom	2012-07-17 18:42:41.000000000 +0200
-+++ gnome-settings-daemon-3.5.4/configure.ac	2012-07-17 18:43:39.000000000 +0200
-@@ -248,12 +248,12 @@ fi
- AC_SUBST(GEOCLUE_DBUS_INTERFACE_XML)
- 
- dnl ---------------------------------------------------------------------------
--dnl - wacom (disabled for s390/s390x and non Linux platforms)
-+dnl - wacom (disabled for s390/s390x, ppc/ppc64 and non Linux platforms)
- dnl ---------------------------------------------------------------------------
- 
- case $host_os in
-   linux*)
--    if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
-+    if test "$host_cpu" = s390 -o "$host_cpu" = s390x -o "$host_cpu" = powerpc -o "$host_cpu" = ppc -o "$host_cpu" = powerpc64 -o "$host_cpu" = ppc64 ; then
-       have_wacom=no
-     else
-       if test x$enable_gudev != xno; then
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 738d48a..c47b734 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -13,8 +13,6 @@ Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 License:        GPLv2+
 URL:            https://download.gnome.org/sources/%{name}
 Source0:        https://download.gnome.org/sources/%{name}/3.23/%{name}-%{version}.tar.xz
-# disable wacom for ppc/ppc64 (used on RHEL)
-Patch0:         %{name}-3.5.4-ppc-no-wacom.patch
 
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(colord) >= 1.0.2
@@ -41,14 +39,13 @@ BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(xtst)
 BuildRequires:  gettext intltool
-BuildRequires:  autoconf automake libtool
 BuildRequires:  cups-devel
 %if 0%{?fedora}
 BuildRequires:  pkgconfig(wayland-client)
 %endif
 BuildRequires:  libxslt
 BuildRequires:  docbook-style-xsl
-%ifnarch s390 s390x %{?rhel:ppc ppc64}
+%ifnarch s390 s390x
 BuildRequires:  pkgconfig(libwacom) >= 0.7
 BuildRequires:  pkgconfig(xorg-wacom)
 %endif
@@ -84,11 +81,6 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%if 0%{?rhel}
-%patch0 -p1 -b .ppc-no-wacom
-%endif
-
-autoreconf -i -f
 
 %build
 %configure --disable-static \
@@ -179,7 +171,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.wacom.gschema.xml
 %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop
 
-%ifnarch s390 s390x %{?rhel:ppc ppc64}
+%ifnarch s390 s390x
 %{_libexecdir}/gsd-wacom
 %{_libexecdir}/gsd-wacom-led-helper
 %{_libexecdir}/gsd-wacom-oled-helper
@@ -221,8 +213,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %files devel
 %{_includedir}/gnome-settings-daemon-3.0
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
-%ifnarch s390 s390x %{?rhel:ppc ppc64}
-%endif
 %{_libexecdir}/gsd-test-input-helper
 
 %changelog