From 18eb617de00b3949098d1f19c35f1e4234500323 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 11 2016 14:03:58 +0000 Subject: move Obsoletes to -libs --- diff --git a/baloo.spec b/baloo.spec index 0a4e40f..22740fd 100644 --- a/baloo.spec +++ b/baloo.spec @@ -47,13 +47,6 @@ 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 @@ -80,17 +73,24 @@ Requires: kdelibs4-devel %package libs Summary: Runtime libraries for %{name} +%if 0%{?kf5_akonadi} +Obsoletes: baloo-akonadi < %{version}-%{release} +%else %{?kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}} %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 @@ -237,7 +237,7 @@ fi %changelog * Wed May 11 2016 Rex Dieter - 4.14.3-10 -- Obsoletes: baloo-akonadi on f24+ (#1334533) +- -libs: Obsoletes: baloo-akonadi on f24+ (#1334533) * Sat Apr 30 2016 Rex Dieter - 4.14.3-9 - kdepim4 needs libbaloopim (f24+)