From 3e4e8dc22d23d5efe91d9e9e13ca5646d2aee0bb Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 15 Dec 2015 12:55:20 +0100 Subject: [PATCH] fix build failure on s390/s390x --- plasma-desktop.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/plasma-desktop.spec b/plasma-desktop.spec index 705ba21..648e607 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -4,7 +4,7 @@ Name: plasma-desktop Summary: Plasma Desktop shell Version: 5.5.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and (GPLv2 or GPLv3) URL: https://projects.kde.org/projects/kde/workspace/plasma-desktop @@ -94,6 +94,8 @@ BuildRequires: pulseaudio-libs-devel BuildRequires: chrpath BuildRequires: desktop-file-utils +# xorg-x11 doesn't have hw_server and disable for s390/s390x +%ifnarch s390 s390x # for kcm_touchpad BuildRequires: xorg-x11-drv-synaptics-devel # for xserver-properties @@ -107,6 +109,7 @@ Requires: iso-codes %if 0%{?fedora} > 20 BuildRequires: xorg-x11-drv-evdev-devel %endif +%endif # Desktop Requires: plasma-workspace >= %{majmin_ver} @@ -221,9 +224,11 @@ fi %files -f plasmadesktop5.lang %license COPYING* +%ifnarch s390 s390x %if 0%{?fedora} > 20 %{_bindir}/kapplymousetheme %endif +%endif %{_bindir}/kaccess %{_bindir}/kfontinst %{_bindir}/kfontview @@ -248,9 +253,11 @@ fi %{_kf5_qmldir}/org/kde/plasma/activityswitcher %{_kf5_qmldir}/org/kde/private/desktopcontainment/* %{_kf5_datadir}/plasma/* +%ifnarch s390 s390x %if 0%{?fedora} > 20 %{_kf5_datadir}/kcminput %endif +%endif %{_kf5_datadir}/color-schemes %{_kf5_datadir}/kconf_update/* %{_kf5_datadir}/kdisplay @@ -282,12 +289,14 @@ fi %{_datadir}/dbus-1/system-services/*.service %{_datadir}/polkit-1/actions/org.kde.fontinst.policy %{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmclock.policy +%ifnarch s390 s390x # kcm_touchpad %{_bindir}/kcm-touchpad-list-devices %{_kf5_qtplugindir}/plasma/dataengine/plasma_engine_touchpad.so %{_datadir}/config.kcfg/touchpad.kcfg %{_datadir}/config.kcfg/touchpaddaemon.kcfg %{_datadir}/dbus-1/interfaces/org.kde.touchpad.xml +%endif %files doc %lang(ca) %{_docdir}/HTML/ca/kcontrol/ @@ -307,6 +316,9 @@ fi %changelog +* Tue Dec 15 2015 Than Ngo - 5.5.0-5 +- fix build failure on s390/s390x + * Wed Dec 09 2015 Rex Dieter 5.5.0-4 - omit env hack, rename plasma update script instead