[kde-baseapps] 14.12.3-3

[Rex Dieter]

commit 94fde716ada2282f6cca9ed25246cccc3c49d237
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Mar 11 11:29:36 2015 -0500

    14.12.3-3
    
    - lower kfmclient_dir.desktop IntialPreference to 9, lower than dolphin 10 (f22+)
    - omit kde-plasma-folderview (f22+)

 kde-baseapps.spec | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/kde-baseapps.spec b/kde-baseapps.spec
index a2d68ab..ba4b4c4 100644
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@ -2,10 +2,14 @@
 # trim changelog included in binary rpms
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
+%if 0%{?fedora} < 22
+%define folderview 1
+%endif
+
 Name:    kde-baseapps
 Summary: KDE Core Applications 
 Version: 14.12.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2 and GFDL
 URL:     https://projects.kde.org/projects/kde/kde-baseapps 
@@ -70,7 +74,9 @@ BuildRequires: pkgconfig(zlib)
 
 Requires: %{name}-common = %{version}-%{release}
 Requires: dolphin = %{version}-%{release}
+%if 0%{?folderview}
 Requires: kde-plasma-folderview = 6:%{version}-%{release}
+%endif
 Requires: kdepasswd = %{version}-%{release}
 Requires: kdialog = %{version}-%{release}
 Requires: keditbookmarks = %{version}-%{release}
@@ -91,11 +97,16 @@ kdialog : Nice dialog boxes from shell scripts
 keditbookmarks : Bookmark organizer and editor
 kfind : File find utility
 konqueror : Web browser, file manager and document viewer
+%if 0%{?folderview}
 plasma_applet_folderview : folderview plasma applet
+%endif
 
 %package common
 Summary: Common files for %{name}
 Conflicts: kde-baseapps < 4.12.0-2
+%if ! 0%{?folderview}
+Obsoletes: kde-plasma-folderview < 6:%{version}-%{release}
+%endif
 BuildArch: noarch
 %description common
 %{summary}
@@ -241,6 +252,16 @@ Requires: libkonq%{?_isa} = %{version}-%{release}
 %patch3 -p2 -b .kde#228593
 %patch5 -p1 -b .konq_mimetype
 
+# not nice to change default in an update, so only do f22+ for now
+%if 0%{?fedora} > 21
+# lower konq priority to less than dolphin(10)
+sed -i -e 's|^InitialPreference=10|InitialPreference=9' konqueror/kfmclient_dir.desktop
+%endif
+
+%if ! 0%{?folderview}
+sed -i -e 's|^add_subdirectory(folderview)|#add_subdirectory(folderview)|g' plasma/applets/CMakeLists.txt
+%endif
+
 
 %build
 mkdir %{_target_platform}
@@ -580,12 +601,18 @@ fi
 %{_kde4_iconsdir}/hicolor/*/apps/kfind.*
 %{_datadir}/appdata/kfind.appdata.xml
 
+%if 0%{?folderview}
 %files -n kde-plasma-folderview
 %{_kde4_libdir}/kde4/plasma_applet_folderview.so
 %{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
+%endif
 
 
 %changelog
+* Wed Mar 11 2015 Rex Dieter <rdieter at fedoraproject.org> - 14.12.3-3
+- lower kfmclient_dir.desktop IntialPreference to 9, lower than dolphin 10 (f22+)
+- omit kde-plasma-folderview (f22+)
+
 * Tue Mar 10 2015 Rex Dieter <rdieter at fedoraproject.org> 14.12.3-2
 - drop unused strigi/soprano build deps