diff --git a/plasma-desktop.spec b/plasma-desktop.spec index 3d1a876..7d3bf7b 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -4,7 +4,7 @@ Name: plasma-desktop Summary: Plasma Desktop shell Version: 5.6.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and (GPLv2 or GPLv3) URL: https://quickgit.kde.org/?p=%{name}.git @@ -149,6 +149,9 @@ Provides: kactivities-workspace = %{version}-%{release} # kimpanel moved here from kdeplasma-addons-5.5.x Conflicts: kdeplasma-addons < 5.6.0 +# kcm_activities.mo moved here (#1325724) +Conflicts: kde-l10n < 15.12.3-4 + %description %{summary}. @@ -323,6 +326,9 @@ fi %changelog +* Mon Apr 11 2016 Rex Dieter - 5.6.2-2 +- Conflicts: kde-l10n < 15.12.3-4 (#1325724) + * Sat Apr 09 2016 Rex Dieter - 5.6.2-1 - 5.6.2