From d23a73940fd6746ca766905a5d1171233e46bd49b4002a42360c9b36472d4179 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 1 Mar 2014 20:11:50 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=6 --- kactivities5.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kactivities5.spec b/kactivities5.spec index ce4f110..8fc3311 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -25,8 +25,6 @@ License: LGPL-2.0+ Group: System/GUI/KDE Url: http://projects.kde.org/kactivities Source0: kactivities-%{version}.tar.xz -# PATCH-FIX-UPSTREAM kamd-rename.patch -- so we don't need to do gimmicks with packaging, https://git.reviewboard.kde.org/r/115602/ -Patch0: kamd-rename.patch BuildRequires: boost-devel >= 1.49.0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 0.0.11 @@ -48,6 +46,7 @@ BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 Obsoletes: kf5-kactivities +Conflicts: kactivities4 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -75,7 +74,6 @@ Provides the interface and basic tools for the KDE workspace. %prep %setup -q -n kactivities-%{version} -%patch0 -p1 %build %if 0%{?suse_version} == 1310 @@ -100,7 +98,6 @@ Provides the interface and basic tools for the KDE workspace. %{_kf5_plugindir}/ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ -%exclude %{_kf5_datadir}/ontology/ %files -n libKF5Activities4 %defattr(-,root,root,-)