From 4f761e37e38182c57f56e05a188b0b904a8c2558 Mon Sep 17 00:00:00 2001
From: Bytez <25850701+Bytezz@users.noreply.github.com>
Date: Mon, 30 Oct 2023 16:23:50 +0100
Subject: [PATCH] Reorganize flatpak recipes

Move flatpak json to flatpak/ folder
Create flatpak Devel json
Edit github Action CI
---
 .github/workflows/ci.yml                      |  4 +-
 flatpak/io.github.bytezz.IPLookup.Devel.json  | 38 +++++++++++++++++++
 .../io.github.bytezz.IPLookup.json            |  4 +-
 3 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 flatpak/io.github.bytezz.IPLookup.Devel.json
 rename io.github.bytezz.IPLookup.json => flatpak/io.github.bytezz.IPLookup.json (91%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4807573..352c1f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     name: Flatpak
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-44
+      image: bilelmoussaoui/flatpak-github-actions:gnome-45
       options: --privileged
     strategy:
       matrix:
@@ -33,6 +33,6 @@ jobs:
       - uses: flatpak/flatpak-github-actions/flatpak-builder@v5
         with:
           bundle: iplookup.flatpak
-          manifest-path: io.github.bytezz.IPLookup.json
+          manifest-path: flatpak/io.github.bytezz.IPLookup.json
           arch: ${{ matrix.arch }}
           cache-key: flatpak-builder-${{ github.sha }}
diff --git a/flatpak/io.github.bytezz.IPLookup.Devel.json b/flatpak/io.github.bytezz.IPLookup.Devel.json
new file mode 100644
index 0000000..3e670a7
--- /dev/null
+++ b/flatpak/io.github.bytezz.IPLookup.Devel.json
@@ -0,0 +1,38 @@
+{
+    "app-id" : "io.github.bytezz.IPLookup",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "master",
+    "sdk" : "org.gnome.Sdk",
+    "command" : "iplookup",
+    "finish-args" : [
+        "--share=network",
+        "--share=ipc",
+        "--socket=fallback-x11",
+        "--device=dri",
+        "--socket=wayland"
+    ],
+    "cleanup" : [
+        "/include",
+        "/lib/pkgconfig",
+        "/man",
+        "/share/doc",
+        "/share/gtk-doc",
+        "/share/man",
+        "/share/pkgconfig",
+        "*.la",
+        "*.a"
+    ],
+    "modules" : [
+        {
+            "name" : "iplookup",
+            "builddir" : true,
+            "buildsystem" : "meson",
+            "sources" : [
+                {
+                    "type" : "dir",
+                    "path" : "../"
+                }
+            ]
+        }
+    ]
+}
diff --git a/io.github.bytezz.IPLookup.json b/flatpak/io.github.bytezz.IPLookup.json
similarity index 91%
rename from io.github.bytezz.IPLookup.json
rename to flatpak/io.github.bytezz.IPLookup.json
index 3e59999..d69f276 100644
--- a/io.github.bytezz.IPLookup.json
+++ b/flatpak/io.github.bytezz.IPLookup.json
@@ -1,7 +1,7 @@
 {
     "app-id" : "io.github.bytezz.IPLookup",
     "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
+    "runtime-version" : "45",
     "sdk" : "org.gnome.Sdk",
     "command" : "iplookup",
     "finish-args" : [
@@ -30,7 +30,7 @@
             "sources" : [
                 {
                     "type" : "dir",
-                    "path" : "./"
+                    "path" : "../"
                 }
             ]
         }