From 72e4e8263f7882b8d87c1b84cc733ffa5d7c31ee Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 11 2016 14:00:09 +0000 Subject: Obsoletes: baloo-akonadi on f24+ (#1334533) --- diff --git a/baloo.spec b/baloo.spec index e531bf8..0a4e40f 100644 --- a/baloo.spec +++ b/baloo.spec @@ -12,7 +12,7 @@ Name: baloo Summary: A framework for searching and managing metadata Version: 4.14.3 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 and LGPLv2 URL: https://quickgit.kde.org/?p=%{name}.git @@ -47,6 +47,13 @@ BuildRequires: xapian-core-devel # kio_tags/kio_timeline moved here from kde-runtime Conflicts: kde-runtime < 4.12.90 +%if 0%{?kf5_akonadi} +Obsoletes: baloo-akonadi < %{version}-%{release} +%else +BuildRequires: pkgconfig(akonadi) >= 1.12.1 +BuildRequires: akonadi-devel < 1.13.0-100 +%endif + Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description @@ -77,17 +84,13 @@ Summary: Runtime libraries for %{name} %description libs %{summary}. -%if ! 0%{?kf5_akonadi} %package akonadi Summary: Baloo indexer and search plugin for Akonadi -BuildRequires: pkgconfig(akonadi) >= 1.12.1 -BuildRequires: akonadi-devel < 1.13.0-100 Requires: %{name}-libs%{?_isa} = %{version}-%{release} # Upgrade path Obsoletes: %{name} < 4.14.0-3 %description akonadi %{summary}. -%endif %prep @@ -233,6 +236,9 @@ fi %changelog +* Wed May 11 2016 Rex Dieter - 4.14.3-10 +- Obsoletes: baloo-akonadi on f24+ (#1334533) + * Sat Apr 30 2016 Rex Dieter - 4.14.3-9 - kdepim4 needs libbaloopim (f24+)