fix build failure on s390/s390x

epel9
Than Ngo 9 years ago
parent fb69a7214b
commit 3e4e8dc22d

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

Loading…
Cancel
Save