diff --git a/kactivities.spec b/kactivities.spec index fa3118c..d2396f7 100644 --- a/kactivities.spec +++ b/kactivities.spec @@ -1,7 +1,10 @@ ## include -nepomuk subpkg support +%if 0%{?fedora} < 24 %define nepomuk 1 +%endif +## favor kf5-kactivities %if 0%{?fedora} > 21 %define plasma5 1 %endif @@ -9,7 +12,7 @@ Name: kactivities Summary: API for using and interacting with Activities Version: 4.13.3 -Release: 11%{?dist} +Release: 20%{?dist} License: GPLv2+ and LGPLv2+ URL: https://projects.kde.org/projects/kde/kdelibs/kactivities @@ -23,7 +26,7 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar BuildRequires: kdelibs4-devel >= %{version} %if ! 0%{?nepomuk} -Obsoletes: %{name}-nepomuk < %{version}-%{release} +Obsoletes: kactivities-nepomuk < 4.13.3-20 %endif %if 0%{?rhel} == 6 @@ -61,7 +64,7 @@ Obsoletes: libkactivities-devel < 6.1-100 Provides: libkactivities-devel = 6.2-1 Requires: %{name}-libs%{?_isa} = %{version}-%{release} %if ! 0%{?nepomuk} -Obsoletes: %{name}-nepomuk-devel < %{version}-%{release} +Obsoletes: kactivities-nepomuk-devel < 4.13.3-20 %endif Requires: kdelibs4-devel %description devel @@ -197,6 +200,9 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/servicetypes/activitymanager-plugin.des %changelog +* Fri Feb 19 2016 Rex Dieter 4.13.3-20 +- disable nepomuk support f24+ + * Thu Feb 04 2016 Fedora Release Engineering - 4.13.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild