From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 19 Jun 2022 21:38:27 +0000 (-0700)
Subject: Use org.gnu.pspp instead of org.fsf.pspp.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=6baee00f28c036c369f8cf6258f42aa8b6f7619d

Use org.gnu.pspp instead of org.fsf.pspp.

Plus other changes to the flatpak manifest suggested by Hubert Figuière
at https://github.com/flathub/flathub/pull/3275.
---

diff --git a/org.fsf.pspp.flatpakref b/org.fsf.pspp.flatpakref
deleted file mode 100644
index 3e8ac16d66..0000000000
--- a/org.fsf.pspp.flatpakref
+++ /dev/null
@@ -1,8 +0,0 @@
-[Flatpak Ref]
-Title=GNU PSPP
-Name=org.fsf.pspp
-Branch=master
-Url=REPO_URL
-IsRuntime=false
-RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo
-GPGKey=LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgptRE1FWWpBT1hoWUpLd1lCQkFIYVJ3OEJBUWRBa09BOUFIVjdMdVdWbmdIbytzWnRSNkgrYTJ0aHlDSDlYbHcwCmx4Q2wrQTIwQkhCemNIQ0lsZ1FURmdnQVBoWWhCTExBR0VkczJJUExFZ3VSMmxDeU1Cd0t0Zkl5QlFKaU1BNWUKQWhzREJRa0R3bWNBQlFzSkNBY0RCUlVLQ1FnTEJSWUNBd0VBQWg0RkFoZUFBQW9KRUZDeU1Cd0t0Zkl5T01ZQgpBSm54dUJlNWFxWTJiVXc1c0ltVXI5ejFKOEtGYzROMjRWdlRqMW1weEJKUkFQOXp6ZnRrNnpQT1gvSS95RFA3CnN0S2lLTTdVNDBGd0dwMmZCTk9WL3AxMENyZzRCR0l3RGw0U0Npc0dBUVFCbDFVQkJRRUJCMERHYlBCVCt0eVUKbWwzS2MxcmRiN2UxR0RpWGVyNEF6c3BCQitkeVZRNlVDQU1CQ0FlSWVBUVlGZ2dBSUJZaEJMTEFHRWRzMklQTApFZ3VSMmxDeU1Cd0t0Zkl5QlFKaU1BNWVBaHNNQUFvSkVGQ3lNQndLdGZJeTh5VUEvanNCczZGRHo1OHhjL3FlCkcyUDFKRjRycmdQZFNxMVU1S3FSYjNPU2hDWUJBUDBVV0NnZTR2QjRFL3NSYmFMMEJQNVR6MnBlOHZ4Vk9IM1AKbFFvTWdYa25EQT09Cj0xQjlWCi0tLS0tRU5EIFBHUCBQVUJMSUMgS0VZIEJMT0NLLS0tLS0K
diff --git a/org.fsf.pspp.yml b/org.fsf.pspp.yml
deleted file mode 100644
index ad4087e619..0000000000
--- a/org.fsf.pspp.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-app-id: org.fsf.pspp
-runtime: org.gnome.Platform
-runtime-version: '41'
-sdk: org.gnome.Sdk
-command: psppire
-modules:
-  - name: spread-sheet-widget
-    buildsystem: autotools
-    sources:
-      - type: archive
-        url: https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-0.8.tar.gz
-        sha256: 8589d8298fcf3b5850d0968b04801a4f40faf0555544f6cc9d954b0162e9954b
-  - name: gsl
-    buildsystem: autotools
-    sources:
-      - type: archive
-        url: https://ftp.gnu.org/gnu/gsl/gsl-2.7.1.tar.gz
-        sha256: dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b
-  - name: pspp
-    buildsystem: simple
-    sources:
-      - type: archive
-        path: SOURCE_PATH
-        dest: pspp
-    build-commands:
-      - cd pspp && ./configure --prefix=/app --libdir=/app/lib && make -j$(nproc) && make -j$(nproc) install
-finish-args:
-  # X11 + XShm access
-  - --share=ipc
-  - --socket=x11
-  # Wayland access
-  - --socket=wayland
-  - --own-name=gnu.pspp
-  - --talk-name=org.gtk.vfs.*
-  - --filesystem=xdg-run/gvfsd
diff --git a/org.gnu.pspp.flatpakref b/org.gnu.pspp.flatpakref
new file mode 100644
index 0000000000..7c63544157
--- /dev/null
+++ b/org.gnu.pspp.flatpakref
@@ -0,0 +1,8 @@
+[Flatpak Ref]
+Title=GNU PSPP
+Name=org.gnu.pspp
+Branch=master
+Url=REPO_URL
+IsRuntime=false
+RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo
+GPGKey=LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgptRE1FWWpBT1hoWUpLd1lCQkFIYVJ3OEJBUWRBa09BOUFIVjdMdVdWbmdIbytzWnRSNkgrYTJ0aHlDSDlYbHcwCmx4Q2wrQTIwQkhCemNIQ0lsZ1FURmdnQVBoWWhCTExBR0VkczJJUExFZ3VSMmxDeU1Cd0t0Zkl5QlFKaU1BNWUKQWhzREJRa0R3bWNBQlFzSkNBY0RCUlVLQ1FnTEJSWUNBd0VBQWg0RkFoZUFBQW9KRUZDeU1Cd0t0Zkl5T01ZQgpBSm54dUJlNWFxWTJiVXc1c0ltVXI5ejFKOEtGYzROMjRWdlRqMW1weEJKUkFQOXp6ZnRrNnpQT1gvSS95RFA3CnN0S2lLTTdVNDBGd0dwMmZCTk9WL3AxMENyZzRCR0l3RGw0U0Npc0dBUVFCbDFVQkJRRUJCMERHYlBCVCt0eVUKbWwzS2MxcmRiN2UxR0RpWGVyNEF6c3BCQitkeVZRNlVDQU1CQ0FlSWVBUVlGZ2dBSUJZaEJMTEFHRWRzMklQTApFZ3VSMmxDeU1Cd0t0Zkl5QlFKaU1BNWVBaHNNQUFvSkVGQ3lNQndLdGZJeTh5VUEvanNCczZGRHo1OHhjL3FlCkcyUDFKRjRycmdQZFNxMVU1S3FSYjNPU2hDWUJBUDBVV0NnZTR2QjRFL3NSYmFMMEJQNVR6MnBlOHZ4Vk9IM1AKbFFvTWdYa25EQT09Cj0xQjlWCi0tLS0tRU5EIFBHUCBQVUJMSUMgS0VZIEJMT0NLLS0tLS0K
diff --git a/org.gnu.pspp.yml b/org.gnu.pspp.yml
new file mode 100644
index 0000000000..a7b470d8cc
--- /dev/null
+++ b/org.gnu.pspp.yml
@@ -0,0 +1,35 @@
+app-id: org.gnu.pspp
+runtime: org.gnome.Platform
+runtime-version: '42'
+sdk: org.gnome.Sdk
+command: psppire
+finish-args:
+  # X11 + XShm access
+  - --share=ipc
+  - --socket=fallback-x11
+  # Wayland access
+  - --socket=wayland
+  - --own-name=gnu.pspp
+  - --talk-name=org.gtk.vfs.*
+  - --filesystem=xdg-run/gvfsd
+modules:
+  - name: spread-sheet-widget
+    buildsystem: autotools
+    sources:
+      - type: archive
+        url: https://alpha.gnu.org/gnu/ssw/spread-sheet-widget-0.8.tar.gz
+        sha256: 8589d8298fcf3b5850d0968b04801a4f40faf0555544f6cc9d954b0162e9954b
+  - name: gsl
+    buildsystem: autotools
+    sources:
+      - type: archive
+        url: https://ftp.gnu.org/gnu/gsl/gsl-2.7.1.tar.gz
+        sha256: dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b
+  - name: pspp
+    buildsystem: simple
+    sources:
+      - type: archive
+        path: SOURCE_PATH
+        dest: pspp
+    build-commands:
+      - cd pspp && ./configure --prefix=/app --libdir=/app/lib && make -j$(nproc) && make -j$(nproc) install