[neon/snap-packaging/kde-qt6-core-sdk] /: Move pkgconfig back to cleanup and search CRAFT_PRIME for files to sed.

[Scarlett Moore]

Git commit 48f815a9b0de9ac3eb7643fdebc4728a760fd9e5 by Scarlett Moore.
Committed on 31/05/2024 at 16:11.
Pushed by scarlettmoore into branch 'master'.

Move pkgconfig back to cleanup and search CRAFT_PRIME for files to sed.

M  +5    -7    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kde-qt6-core-sdk/-/commit/48f815a9b0de9ac3eb7643fdebc4728a760fd9e5

diff --git a/snapcraft.yaml b/snapcraft.yaml
index b61f6fd..7d68029 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -373,13 +373,6 @@ parts:
     organize:
       usr/share/pkgconfig: usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
       lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR: usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
-    override-stage: |
-        craftctl default
-        find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's:/root/stage:/snap/$CRAFT_PROJECT_NAME/current:g' {}*" \;
-        find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's|libdir=/usr|libdir=/snap/$CRAFT_PROJECT_NAME/current/usr|g' {}*" \;
-        find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's|includedir=/usr|includedir=/snap/$CRAFT_PROJECT_NAME/current/usr|g' {}*" \;
-        find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's|exec_prefix=/usr|exec_prefix=/snap/$CRAFT_PROJECT_NAME/current/usr|g' {}*" \;
-        find $CRAFT_STAGE -type f,l -name "*.pc" -exec bash -c "sed -i 's|modlibexecdir=/usr|modlibexecdir=/snap/$CRAFT_PROJECT_NAME/current/usr|g' {}*" \;
     prime:
       - -etc
       - -lib
@@ -396,6 +389,11 @@ parts:
     after: [debs]
     override-stage: |
       set -eux
+      find $CRAFT_PRIME -type f,l -name "*.pc" -exec bash -c "sed -i 's|^prefix=.*$|prefix=/snap/$CRAFT_PROJECT_NAME/current/usr|g'' {}*" \;
+      find $CRAFT_PRIME -type f,l -name "*.pc" -exec bash -c "sed -i 's|libdir=/usr|libdir=/snap/$CRAFT_PROJECT_NAME/current/usr|g' {}*" \;
+      find $CRAFT_PRIME -type f,l -name "*.pc" -exec bash -c "sed -i 's|includedir=/usr|includedir=/snap/$CRAFT_PROJECT_NAME/current/usr|g' {}*" \;
+      find $CRAFT_PRIME -type f,l -name "*.pc" -exec bash -c "sed -i 's|exec_prefix=/usr|exec_prefix=/snap/$CRAFT_PROJECT_NAME/current/usr|g' {}*" \;
+      find $CRAFT_PRIME -type f,l -name "*.pc" -exec bash -c "sed -i 's|modlibexecdir=/usr|modlibexecdir=/snap/$CRAFT_PROJECT_NAME/current/usr|g' {}*" \;
       for snap in "core22" "ffmpeg-2204-sdk"; do
         cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$CRAFT_PRIME/{}" \;
       done