Merge pull request #6526 from suvari/master

plasma-desktop: clean conflicted files with plasma-workspaces
2019-02-13 21:53:54 +03:00
parent b6c30ade14 7504fe2617
commit 5688a08899
2 changed files with 14 additions and 1 deletions
@@ -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")
@@ -177,6 +177,13 @@
    </Package>

    <History>
+        <Update release="28">
+            <Date>2019-02-13</Date>
+            <Version>5.14.5</Version>
+            <Comment>Clean kcm_translations.mo</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
+        </Update>
        <Update release="27">
            <Date>2019-02-09</Date>
            <Version>5.14.5</Version>
@@ -367,4 +374,4 @@
            <Email>yusuf.aydemir@pisilinux.org</Email>
        </Update>
    </History>
-</PISI>
+</PISI>