diff --git a/khotkeys.spec b/khotkeys.spec index 6cf2658..4ec0622 100644 --- a/khotkeys.spec +++ b/khotkeys.spec @@ -36,8 +36,6 @@ BuildRequires: libX11-devel Requires: kf5-filesystem -# TODO: Remove When khotkeys has been split from kde-workspace -Conflicts: kde-workspace < 5.0.0-1 %description An advanced editor component which is used in numerous KDE applications @@ -86,6 +84,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{_libdir}/cmake/KHotKeysDBusInterface %changelog +* Mon May 11 2015 Nils Philippsen +- don't conflict kde-workspace anymore + * Mon Apr 27 2015 Daniel Vrátil - 5.3.0-1 - Plasma 5.3.0