#1 Changes to build on epel8
Closed 3 years ago by tdawson. Opened 4 years ago by tdawson.
rpms/ tdawson/plasma-desktop epel8-ifs  into  epel8

file modified
+24 -1
@@ -1,10 +1,16 @@ 

  

  %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.17.3

- Release: 1%{?dist}

+ Release: 2%{?dist}

  

  License: GPLv2+ and (GPLv2 or GPLv3)

  URL:     https://cgit.kde.org/%{name}.git
@@ -50,7 +56,9 @@ 

  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 +91,9 @@ 

  BuildRequires:  plasma-workspace-devel >= %{majmin_ver}

  

  # Optional

+ %if 0%{?fedora}

  BuildRequires:  cmake(AppStreamQt)

+ %enif

  BuildRequires:  kf5-kactivities-devel >= %{kf5_version_min}

  BuildRequires:  kf5-kactivities-stats-devel >= %{kf5_version_min}

  BuildRequires:  libcanberra-devel
@@ -109,8 +119,10 @@ 

  # 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}
@@ -149,12 +161,14 @@ 

  %description

  %{summary}.

  

+ %if 0%{?scim}

  %package        kimpanel-scim

  Summary:        SCIM backend for kimpanel

  Requires:       %{name} = %{version}-%{release}

  %description    kimpanel-scim

  A backend for the kimpanel panel icon for input methods using the SCIM input

  method framework.

+ %endif

  

  %package        doc

  Summary:        Documentation and user manuals for %{name}
@@ -258,6 +272,7 @@ 

  %{_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
@@ -265,6 +280,7 @@ 

  %{_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/
@@ -299,13 +315,20 @@ 

  %{_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

  

  

  %changelog

+ * Fri Nov 22 2019 Troy Dawson <tdawson@redhat.com> - 5.17.3-2

+ - Don't build with scim in RHEL8 (#1762523)

+ - Don't build with synaptics in RHEL8 (#1762551)

+ - Don't build with appstream in RHEL8 (#1775839)

+ 

  * Wed Nov 13 2019 Martin Kyral <martin.kyral@gmail.com> - 5.17.3-1

  - 5.17.3

  

There are three parts.

rebased onto 38dfd1d

3 years ago

These changes have been implemented in other, different pull requests and changes.
Closing without merging.

Pull-Request has been closed by tdawson

3 years ago