From 7504fe2617896acc180fcc58b9fe6cef9cbfa876 Mon Sep 17 00:00:00 2001 From: suvari Date: Wed, 13 Feb 2019 21:52:49 +0300 Subject: [PATCH] plasma-desktop: clean conflicted files with plasma-workspaces --- desktop/kde/plasma/plasma-desktop/actions.py | 6 ++++++ desktop/kde/plasma/plasma-desktop/pspec.xml | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/desktop/kde/plasma/plasma-desktop/actions.py b/desktop/kde/plasma/plasma-desktop/actions.py index f043fed6fe..73773fed5a 100755 --- a/desktop/kde/plasma/plasma-desktop/actions.py +++ b/desktop/kde/plasma/plasma-desktop/actions.py @@ -20,4 +20,10 @@ def build(): def install(): kde5.install() + # Conflicts with plasma-workspace + pisitools.remove("/usr/share/doc/HTML") + pisitools.remove("/usr/share/locale/") + pisitools.remove("/usr/lib/qt5/plugins/kcms/kcm_translations.so") + pisitools.remove("/usr/share/kpackage/kcms/kcm_translations/*") + pisitools.dodoc("HACKING", "COPYING") diff --git a/desktop/kde/plasma/plasma-desktop/pspec.xml b/desktop/kde/plasma/plasma-desktop/pspec.xml index 9e3413dd44..03e733fe02 100755 --- a/desktop/kde/plasma/plasma-desktop/pspec.xml +++ b/desktop/kde/plasma/plasma-desktop/pspec.xml @@ -177,6 +177,13 @@ + + 2019-02-13 + 5.14.5 + Clean kcm_translations.mo + Kamil Atlı + suvari@pisilinux.org + 2019-02-09 5.14.5 @@ -367,4 +374,4 @@ yusuf.aydemir@pisilinux.org - + \ No newline at end of file