From 9f0b78817f0eca64464308b4babbbd468111267f58432bf2330005419afe454d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 23 May 2023 07:00:14 +0000 Subject: [PATCH] Accepting request 1088528 from home:dmach:branches:openSUSE:Tools Fix building AppImage: - change shebang from /usr/bin/env python3 to /usr/bin/python3 to use the interpreter from the image - also update packages to list all obs services and scm-bridge OBS-URL: https://build.opensuse.org/request/show/1088528 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=401 --- appimage.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/appimage.yml b/appimage.yml index ad8a33e..79ae3f6 100644 --- a/appimage.yml +++ b/appimage.yml @@ -8,15 +8,18 @@ ingredients: packages: - build - osc - - python-yaml + - obs-scm-bridge + - obs-service-download_files + - obs-service-format_spec_file - obs-service-obs_scm - - obs-service-tar_scm - - obs-service-set_version - obs-service-recompress + - obs-service-set_version + - obs-service-tar_scm + - obs-service-verify_file - openSUSE-release - openSUSE-release-ftp - rsync - + script: - mkdir -p $BUILD_APPDIR/usr/share/pixmaps - cp /usr/share/pixmaps/appimage.png $BUILD_APPDIR/usr/share/pixmaps @@ -27,7 +30,7 @@ script: - echo "Icon=appimage" >> $BUILD_APPDIR/usr/share/applications/osc.desktop - echo "Categories=Development" >> $BUILD_APPDIR/usr/share/applications/osc.desktop - echo "Type=Application" >> $BUILD_APPDIR/usr/share/applications/osc.desktop -# - sed -i -e 's,^#!/usr/bin/python,#!/usr/bin/env python,' $BUILD_APPDIR/usr/bin/osc + # /usr/bin/python3 would run system python3 with libs from the appimage + # while /usr/bin/env python3 uses the correct binary from the appimage + - sed -i -e 's,^#!/usr/bin/python3,#!/usr/bin/env python3,' $BUILD_APPDIR/usr/bin/osc - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2 - -