From 06e8db7cc0154b800255604693dd7ff45240c0dc Mon Sep 17 00:00:00 2001
From: Dan Vrátil <dvratil@redhat.com>
Date: Aug 18 2014 12:45:41 +0000
Subject: Improve coinstallability with kf5-baloo


---

diff --git a/baloo.spec b/baloo.spec
index be107bf..33e812b 100644
--- a/baloo.spec
+++ b/baloo.spec
@@ -2,7 +2,7 @@
 Name:    baloo
 Summary: A framework for searching and managing metadata
 Version: 4.14.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2 and LGPLv2
 URL:     https://projects.kde.org/projects/kde/kdelibs/baloo
@@ -24,8 +24,8 @@ Source1: 97-kde-baloo-filewatch-inotify.conf
 
 BuildRequires: doxygen
 BuildRequires: kdelibs4-devel >= %{version}
-BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: kfilemetadata-devel >= %{version}
+#BuildRequires: kdepimlibs-devel >= %{version}
+#BuildRequires: kfilemetadata-devel >= %{version}
 BuildRequires: pkgconfig(akonadi) >= 1.12.1
 BuildRequires: pkgconfig(QJson)
 # for %%{_polkit_qt_policydir} macro
@@ -46,7 +46,7 @@ Summary: File indexing and search for %{name}
 # upgrade path, when split occurred
 Obsoletes: baloo < 4.13.0-3
 Obsoletes: nepomuk-core < 4.13.0-2
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # for kcm.  since this is split out, we can afford to add this dep
 # and not worry about circular dependencies
 Requires: kde-runtime
@@ -63,10 +63,15 @@ Requires: kdelibs4-devel
 %package libs
 Summary:  Runtime libraries for %{name}
 Requires: kdelibs4%{?_isa} >= %{version}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} >= %{version}-%{release}
 %description libs
 %{summary}.
 
+%package akonadi
+Summary: Baloo indexer and search plugin for Akonadi
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+%description akonadi
+%{summary}.
 
 %prep
 %autosetup -p1
@@ -106,31 +111,10 @@ fi
 
 %files
 %doc COPYING COPYING.LIB
-%{_kde4_bindir}/akonadi_baloo_indexer
 %{_kde4_bindir}/balooctl
 %{_kde4_bindir}/baloosearch
 %{_kde4_bindir}/balooshow
-%{_kde4_datadir}/akonadi/agents/akonadibalooindexingagent.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_datadir}/kde4/services/baloo_calendarsearchstore.desktop
-%{_kde4_datadir}/kde4/services/baloo_contactsearchstore.desktop
-%{_kde4_datadir}/kde4/services/baloo_emailsearchstore.desktop
-%{_kde4_datadir}/kde4/services/baloo_notesearchstore.desktop
-%{_kde4_datadir}/kde4/services/baloosearch.protocol
-%{_kde4_datadir}/kde4/services/plasma-runner-baloosearch.desktop
-%{_kde4_datadir}/kde4/services/tags.protocol
-%{_kde4_datadir}/kde4/services/timeline.protocol
-%{_kde4_datadir}/kde4/servicetypes/baloosearchstore.desktop
-%{_kde4_libdir}/kde4/akonadi/akonadi_baloo_searchplugin.so
-%{_kde4_libdir}/kde4/akonadi/akonadibaloosearchplugin.desktop
-%{_kde4_libdir}/kde4/baloo_calendarsearchstore.so
-%{_kde4_libdir}/kde4/baloo_contactsearchstore.so
-%{_kde4_libdir}/kde4/baloo_emailsearchstore.so
-%{_kde4_libdir}/kde4/baloo_notesearchstore.so
-%{_kde4_libdir}/kde4/kio_baloosearch.so
-%{_kde4_libdir}/kde4/kio_tags.so
-%{_kde4_libdir}/kde4/kio_timeline.so
-%{_kde4_libdir}/kde4/krunner_baloosearchrunner.so
 
 %post file
 if [ -f "%{_sysconfdir}/sysctl.d/97-kde-nepomuk-filewatch-inotify.conf" ]; then
@@ -159,6 +143,14 @@ fi
 %{_kde4_datadir}/kde4/services/kcm_baloofile.desktop
 %{_kde4_libdir}/kde4/kcm_baloofile.so
 
+
+%files akonadi
+%{_kde4_bindir}/akonadi_baloo_indexer
+%{_kde4_datadir}/akonadi/agents/akonadibalooindexingagent.desktop
+%{_kde4_libdir}/kde4/akonadi/akonadi_baloo_searchplugin.so
+%{_kde4_libdir}/kde4/akonadi/akonadibaloosearchplugin.desktop
+
+
 %files devel
 %{_kde4_includedir}/baloo/
 %{_kde4_libdir}/libbaloocore.so
@@ -177,9 +169,31 @@ fi
 %{_kde4_libdir}/libbaloopim.so.4*
 %{_kde4_libdir}/libbalooqueryparser.so.4*
 %{_kde4_libdir}/libbalooxapian.so.4*
+%{_kde4_datadir}/kde4/services/baloosearch.protocol
+%{_kde4_datadir}/kde4/services/plasma-runner-baloosearch.desktop
+%{_kde4_datadir}/kde4/services/tags.protocol
+%{_kde4_datadir}/kde4/services/timeline.protocol
+%{_kde4_libdir}/kde4/kio_baloosearch.so
+%{_kde4_libdir}/kde4/kio_tags.so
+%{_kde4_libdir}/kde4/kio_timeline.so
+%{_kde4_libdir}/kde4/krunner_baloosearchrunner.so
+%{_kde4_libdir}/kde4/baloo_calendarsearchstore.so
+%{_kde4_libdir}/kde4/baloo_contactsearchstore.so
+%{_kde4_libdir}/kde4/baloo_emailsearchstore.so
+%{_kde4_libdir}/kde4/baloo_notesearchstore.so
+%{_kde4_datadir}/kde4/servicetypes/baloosearchstore.desktop
+%{_kde4_datadir}/kde4/services/baloo_calendarsearchstore.desktop
+%{_kde4_datadir}/kde4/services/baloo_contactsearchstore.desktop
+%{_kde4_datadir}/kde4/services/baloo_emailsearchstore.desktop
+%{_kde4_datadir}/kde4/services/baloo_notesearchstore.desktop
 
 
 %changelog
+* Mon Aug 18 2014 Daniel Vrátil <dvratil@redhat.com> - 4.14.0-3
+- Improve coinstallability with kf5-baloo
+- Move Akonadi indexer to -akonadi subpackage
+- Move stores and plugins to -libs subpackage
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.14.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild