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

[Jonathan Riddell]

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

simplify

M  +9    -16   snapcraft.yaml

https://invent.kde.org/neon/kde/okular/commit/239209cb739b1e291461105944ecaf8ef4768bf8

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 33c4a1a..dab630a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -41,27 +41,14 @@ package-repositories:
     url: http://origin.archive.neon.kde.org/user
     key-server: keyserver.ubuntu.com
 parts:
-    kde-frameworks-5-env:
-        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"
-        plugin: dump
-        source: https://anongit.kde.org/snap-kf5-launcher.git
     poppler:
         build-snaps:
         - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
         plugin: cmake
         source: https://poppler.freedesktop.org/poppler-21.03.0.tar.xz
+        build-environment:
+        - CMAKE_BUILD_PARALLEL_LEVEL: "4"
+        - VERBOSE: "1"
         build-packages:
         - build-essential
         - libfreetype6-dev
@@ -130,6 +117,9 @@ parts:
         - kde-frameworks-5-env
         - poppler
         plugin: cmake
+        build-environment:
+        - CMAKE_BUILD_PARALLEL_LEVEL: "4"
+        - VERBOSE: "1"
         build-packages:
         - libchm-dev
         - libdjvulibre-dev
@@ -209,3 +199,6 @@ parts:
         - "-DKDE_SKIP_TEST_SETTINGS=ON"
         - "-DKDE_INSTALL_PLUGINDIR=/usr/lib/x86_64-linux-gnu/qt5/plugins/"
         - "-DCMAKE_FIND_ROOT_PATH=/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
+    kde-frameworks-5-env:
+        plugin: dump
+        source: https://invent.kde.org/packaging/snap-kf5-launcher.git