diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index a2bb601..90ef7a1 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -5,6 +5,7 @@ Thu Apr 23 13:27:33 UTC 2015 - hrvoje.senjan@gmail.com * For more details please see: https://www.kde.org/announcements/plasma-5.3.0.php - Drop 0001-delete-the-views-before-containments.patch, merged upstream +- Only conflict with kdebase4-workspace < 5.3.0 ------------------------------------------------------------------- Sat Apr 11 18:53:49 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 495e53a..bc143dd 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -91,7 +91,7 @@ BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(zlib) -Conflicts: kdebase4-workspace +Conflicts: kdebase4-workspace < 5.3.0 Requires: %{name}-branding = %{_plasma5_branding_version} Requires: %{name}-libs = %{version}-%{release} # used within startup