From 12e453f0990992b934740646703bef8480c38ba0 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 27 Feb 2020 19:44:17 -0800 Subject: [PATCH] Don't build with scim in RHEL8 (#1762523) Don't build with synaptics in RHEL8 (#1762551) Don't build with appstream in RHEL8 (#1775839) --- plasma-desktop.spec | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/plasma-desktop.spec b/plasma-desktop.spec index a5aa61e..791f7f0 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -1,6 +1,13 @@ %global kf5_version_min 5.42 +%global synaptics 1 +%global scim 1 +%if 0%{?rhel} && 0%{?rhel} > 7 +%global synaptics 0 +%global scim 0 +%endif + Name: plasma-desktop Summary: Plasma Desktop shell Version: 5.18.2 @@ -50,7 +57,9 @@ BuildRequires: qt5-qtdeclarative-devel BuildRequires: phonon-qt5-devel BuildRequires: ibus-devel +%if 0%{?scim} BuildRequires: scim-devel +%endif BuildRequires: kf5-rpm-macros >= %{kf5_version_min} BuildRequires: extra-cmake-modules @@ -83,7 +92,9 @@ BuildRequires: plasma-breeze >= %{majmin_ver} BuildRequires: plasma-workspace-devel >= %{majmin_ver} # Optional +%if 0%{?rhel} && 0%{?rhel} > 7 BuildRequires: cmake(AppStreamQt) +%endif BuildRequires: kf5-kactivities-devel >= %{kf5_version_min} BuildRequires: kf5-kactivities-stats-devel >= %{kf5_version_min} BuildRequires: libcanberra-devel @@ -109,8 +120,10 @@ Requires: iso-codes # for kcm_input, kcm_touchpad BuildRequires: pkgconfig(xorg-evdev) BuildRequires: pkgconfig(xorg-libinput) +%if 0%{?synaptics} BuildRequires: pkgconfig(xorg-synaptics) %endif +%endif # Desktop Requires: plasma-workspace >= %{majmin_ver} @@ -260,6 +273,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k %{_kf5_qmldir}/org/kde/activities/settings/ %{_kf5_datadir}/plasma/* %ifnarch s390 s390x +%if 0%{?synaptics} # touchpad %{_kf5_datadir}/kservices5/kded/touchpad.desktop %{_bindir}/kcm-touchpad-list-devices @@ -267,6 +281,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k %{_datadir}/config.kcfg/touchpad.kcfg %{_datadir}/config.kcfg/touchpaddaemon.kcfg %{_datadir}/dbus-1/interfaces/org.kde.touchpad.xml +%endif # kcminput %{_kf5_bindir}/kapplymousetheme %{_kf5_datadir}/kcmmouse/ @@ -316,8 +331,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k %{_datadir}/polkit-1/actions/org.kde.fontinst.policy %{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmclock.policy +%if 0%{?scim} %files kimpanel-scim %{_libexecdir}/kimpanel-scim-panel +%endif %files doc -f %{name}-doc.lang