From 8d260abec67581fd18ec8b3ccdd17afed553c5ee Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Apr 23 2015 20:55:42 +0000
Subject: Merge branch 'f21' into f20


---

diff --git a/.gitignore b/.gitignore
index 07ef1bb..300a007 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /kde-baseapps-14.12.1.tar.xz
 /kde-baseapps-14.12.2.tar.xz
 /kde-baseapps-14.12.3.tar.xz
+/kde-baseapps-15.04.0.tar.xz
diff --git a/kde-baseapps.spec b/kde-baseapps.spec
index 7fc0820..1f9817d 100644
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@ -2,9 +2,13 @@
 # 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
+Version: 15.04.0
 Release: 1%{?dist}
 
 License: GPLv2 and GFDL
@@ -65,14 +69,14 @@ BuildRequires: libtidy-devel
 %endif
 BuildRequires: pkgconfig
 BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(libstreams)
-BuildRequires: pkgconfig(soprano)
 BuildRequires: pkgconfig(xrender)
 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}
@@ -93,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}
@@ -243,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|g' 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}
@@ -582,12 +601,24 @@ 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
+* Tue Apr 14 2015 Rex Dieter <rdieter@fedoraproject.org> - 15.04.0-1
+- 15.04.0
+
+* Wed Mar 11 2015 Rex Dieter <rdieter@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@fedoraproject.org> 14.12.3-2
+- drop unused strigi/soprano build deps
+
 * Sun Mar 01 2015 Rex Dieter <rdieter@fedoraproject.org> - 14.12.3-1
 - 14.12.3
 
diff --git a/sources b/sources
index 6e79dcb..d0bde23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe45c86a64f6f66b958d24b22848ba9f  kde-baseapps-14.12.3.tar.xz
+e5531cb22bc11bb481d0ff75ed3411cf  kde-baseapps-15.04.0.tar.xz