From 38114928986688c25a8d24f3ca4a57fe5da7d11f5562659bac4b8c743af36453 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 27 Apr 2015 18:42:31 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=68 --- plasma5-workspace.changes | 1 + plasma5-workspace.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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