muon-discover => plasma-discover (f24+)

plasma-desktop.spec

@@ -4,7 +4,7 @@
 Name:    plasma-desktop
 Summary: Plasma Desktop shell
 Version: 5.6.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+ and (GPLv2 or GPLv3)
 URL:     https://quickgit.kde.org/?p=%{name}.git
@@ -30,7 +30,8 @@ Patch102: plasma-desktop-fedora_layout.patch
 ## upstream patches
 
 ## upstream patches (master branch)
-Patch21: 0001-Fix-building-on-Linux-with-clang-libc.patch
+Patch1:  0001-Fix-building-on-Linux-with-clang-libc.patch
+Patch65: 0065-muon-discover-plasma-discover.patch
 
 ## upstreamable patches
 # missing '#include <config-workspace.h>' means PK never used
@@ -60,8 +61,12 @@ BuildRequires:  scim-devel
 # PackageKit-Qt 5 is not avaialble on F20, because PackageKit is too old there
 %if 0%{?fedora} >= 21
 BuildRequires:  PackageKit-Qt5-devel
+%if 0%{?fedora} > 23
+Recommends: plasma-discover >= %{majmin_ver}
+%else
 Recommends: muon-discover >= %{majmin_ver}
 %endif
+%endif
 
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  extra-cmake-modules
@@ -172,7 +177,11 @@ BuildArch: noarch
 %prep
 %setup -q
 
-%patch21 -p1 -b .0001
+%patch1 -p1 -b .0001
+## muon-discover => plasma-discover rename on f24+ only
+%if 0%{?fedora} > 23
+%patch65 -p1 -b .0065
+%endif
 %patch50 -p1 -b .PackageKit
 
 %if 0%{?fedora} > 22
@@ -326,6 +335,9 @@ fi
 
 
 %changelog
+* Mon Apr 18 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.2-3
+- muon-discover => plasma-discover (f24+)
+
 * Mon Apr 11 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.2-2
 - Conflicts: kde-l10n < 15.12.3-4 (#1325724)