[neon/kde/kcalc/Neon/release] /: simplify

[Jonathan Riddell]

Git commit f665f617153f268b1eefc29018546190366fbf3f by Jonathan Riddell.
Committed on 09/03/2021 at 13:33.
Pushed by jriddell into branch 'Neon/release'.

simplify

M  +6    -16   snapcraft.yaml

https://invent.kde.org/neon/kde/kcalc/commit/f665f617153f268b1eefc29018546190366fbf3f

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 75731e8..f241863 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -44,7 +44,7 @@ parts:
         parse-info:
         - usr/share/metainfo/org.kde.kcalc.appdata.xml
         build-snaps:
-        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate/latest/candidate
+        - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
         after:
         - kde-frameworks-5-env
         plugin: cmake
@@ -54,6 +54,9 @@ parts:
         - qt5-default
         - docbook-xml
         - docbook-xsl
+        build-environment:
+        - CMAKE_BUILD_PARALLEL_LEVEL: "4"
+        - VERBOSE: "1"
         stage-packages:
         - libmpfr6
         - libgmp10
@@ -66,7 +69,7 @@ parts:
         - "-DBUILD_TESTING=OFF"
         - "-DKDE_SKIP_TEST_SETTINGS=ON"
         - "-DCMAKE_FIND_ROOT_PATH=/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
-        - "-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate/current"
+        - "-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
         filesets:
             exclusion:
             - "-usr/lib/*/cmake/*"
@@ -82,17 +85,4 @@ parts:
         - "$exclusion"
     kde-frameworks-5-env:
         plugin: dump
-        source: https://anongit.kde.org/snap-kf5-launcher.git
-        filesets:
-            exclusion:
-            - "-usr/lib/*/cmake/*"
-            - "-usr/include/*"
-            - "-usr/share/ECM/*"
-            - "-usr/share/doc/*"
-            - "-usr/share/man/*"
-            - "-usr/share/icons/breeze-dark*"
-            - "-usr/bin/X11"
-            - "-usr/lib/gcc/x86_64-linux-gnu/6.0.0"
-            - "-usr/lib/aspell/*"
-        prime:
-        - "$exclusion"
+        source: https://invent.kde.org/packaging/snap-kf5-launcher.git