Flatpak: Switch to stable runtime

6 files changed, 18 insertions, 36 deletions

diff --git a/flatpak/org.gajim.Gajim.Plugin.appindicator.yaml b/flatpak/org.gajim.Gajim.Plugin.appindicator.yaml
index 32ab71d..767b21e 100644
--- a/flatpak/org.gajim.Gajim.Plugin.appindicator.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.appindicator.yaml
@@ -1,5 +1,5 @@
-id: org.gajim.Gajim.Devel.Plugin.appindicator
-runtime: org.gajim.Gajim.Devel
+id: org.gajim.Gajim.Plugin.appindicator
+runtime: org.gajim.Gajim
 sdk: org.gnome.Sdk//3.38
 build-extension: true
 separate-locales: false
@@ -21,7 +21,7 @@ modules:
       - 'cp -R -t ${FLATPAK_DEST} *'
     post-install:
       - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.appindicator.metainfo.xml
-      - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.appindicator --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.appindicator
+      - appstream-compose --basename=org.gajim.Gajim.Plugin.appindicator --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.appindicator
     sources:
       - type: archive
         url: https://ftp.gajim.org/plugins_releases/appindicator_integration_1.3.2.zip
@@ -29,6 +29,3 @@ modules:
       - type: file
         path: ../appindicator_integration/org.gajim.Gajim.Plugin.appindicator.metainfo.xml
         sha256: 8591662b70ac496a2411ced0e08fa630744416eb3f301c006e12207ee84cecbf
-      - type: shell
-        commands:
-          - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml
diff --git a/flatpak/org.gajim.Gajim.Plugin.omemo.yaml b/flatpak/org.gajim.Gajim.Plugin.omemo.yaml
index 373ad56..ef339ae 100644
--- a/flatpak/org.gajim.Gajim.Plugin.omemo.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.omemo.yaml
@@ -1,5 +1,5 @@
-id: org.gajim.Gajim.Devel.Plugin.omemo
-runtime: org.gajim.Gajim.Devel
+id: org.gajim.Gajim.Plugin.omemo
+runtime: org.gajim.Gajim
 sdk: org.gnome.Sdk//3.38
 build-extension: true
 separate-locales: false
@@ -54,11 +54,8 @@ modules:
       - 'cp -R -t ${FLATPAK_DEST} *'
     post-install:
       - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.omemo.metainfo.xml
-      - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.omemo --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.omemo
+      - appstream-compose --basename=org.gajim.Gajim.Plugin.omemo --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.omemo
     sources:
       - type: archive
         url: https://ftp.gajim.org/plugins_releases/omemo_2.7.12.zip
         sha256: b645b9f812e76f52c10025f98fa8cfdaf7621a5a49c51ee864ceeb2a1038f35f
-      - type: shell
-        commands:
-          - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml
diff --git a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
index 161fd31..e4aeb90 100644
--- a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
@@ -1,5 +1,5 @@
-id: org.gajim.Gajim.Devel.Plugin.openpgp
-runtime: org.gajim.Gajim.Devel
+id: org.gajim.Gajim.Plugin.openpgp
+runtime: org.gajim.Gajim
 sdk: org.gnome.Sdk//3.38
 build-extension: true
 separate-locales: false
@@ -47,11 +47,8 @@ modules:
       - 'cp -R -t ${FLATPAK_DEST} *'
     post-install:
       - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.openpgp.metainfo.xml
-      - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.openpgp --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.openpgp
+      - appstream-compose --basename=org.gajim.Gajim.Plugin.openpgp --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.openpgp
     sources:
       - type: archive
         url: https://ftp.gajim.org/plugins_releases/openpgp_1.3.9.zip
         sha256: 43d490a4b125a4d97bdf89bf55d2012cd1c48a66464b965726b2c27055defb3b
-      - type: shell
-        commands:
-          - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml
diff --git a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
index 91a66d6..ffb7106 100644
--- a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
@@ -1,5 +1,5 @@
-id: org.gajim.Gajim.Devel.Plugin.pgp
-runtime: org.gajim.Gajim.Devel
+id: org.gajim.Gajim.Plugin.pgp
+runtime: org.gajim.Gajim
 sdk: org.gnome.Sdk//3.38
 build-extension: true
 separate-locales: false
@@ -25,11 +25,8 @@ modules:
       - 'cp -R -t ${FLATPAK_DEST} *'
     post-install:
       - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.pgp.metainfo.xml
-      - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.pgp --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.pgp
+      - appstream-compose --basename=org.gajim.Gajim.Plugin.pgp --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.pgp
     sources:
       - type: archive
         url: https://ftp.gajim.org/plugins_releases/pgp_1.3.5.zip
         sha256: 76d9054e759d9b275d2314c7ec19e70f4f1e12531812f31a4ac279ff55f0bc9b
-      - type: shell
-        commands:
-          - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml
diff --git a/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml b/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml
index c8e3986..2942e81 100644
--- a/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml
@@ -1,5 +1,5 @@
-id: org.gajim.Gajim.Devel.Plugin.syntax_highlight
-runtime: org.gajim.Gajim.Devel
+id: org.gajim.Gajim.Plugin.syntax_highlight
+runtime: org.gajim.Gajim
 sdk: org.gnome.Sdk//3.38
 build-extension: true
 separate-locales: false
@@ -34,11 +34,8 @@ modules:
       - 'cp -R -t ${FLATPAK_DEST} *'
     post-install:
       - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml
-      - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.syntax_highlight --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.syntax_highlight
+      - appstream-compose --basename=org.gajim.Gajim.Plugin.syntax_highlight --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.syntax_highlight
     sources:
       - type: archive
         url: https://ftp.gajim.org/plugins_releases/syntax_highlight_1.3.2.zip
         sha256: 7abf68db96839f9f1e7ebbcfa6e7794d7f504550c1edbb03f2f9c91b0eb3ee2e
-      - type: shell
-        commands:
-          - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml
diff --git a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml b/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml
index 510ae4a..664ca38 100644
--- a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml
@@ -1,5 +1,5 @@
-id: org.gajim.Gajim.Devel.Plugin.url_image_preview
-runtime: org.gajim.Gajim.Devel
+id: org.gajim.Gajim.Plugin.url_image_preview
+runtime: org.gajim.Gajim
 sdk: org.gnome.Sdk//3.38
 build-extension: true
 separate-locales: false
@@ -18,11 +18,8 @@ modules:
       - 'cp -R -t ${FLATPAK_DEST} *'
     post-install:
       - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml
-      - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.url_image_preview --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.url_image_preview
+      - appstream-compose --basename=org.gajim.Gajim.Plugin.url_image_preview --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.url_image_preview
     sources:
       - type: archive
         url: https://ftp.gajim.org/plugins_releases/url_image_preview_2.5.6.zip
         sha256: bd5e11ebee6db9017b59b5f57fe4fcdadd59468399481690ebe33cb250f6626d
-      - type: shell
-        commands:
-          - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml