[recipes] Fix up build-bundle.sh

[Matthias Clasen <matthiasc src gnome org>]

commit 901bf6f6501bf085795635bf561df285aa371109
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Mar 18 11:42:02 2017 -0400

    Fix up build-bundle.sh
    
    Move build-bundle.sh to the flatpak subdirectory, and make
    it work again.

 build-bundle.sh => flatpak/build-bundle.sh |    5 ++++-
 flatpak/org.gnome.Recipes.json             |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/build-bundle.sh b/flatpak/build-bundle.sh
similarity index 74%
rename from build-bundle.sh
rename to flatpak/build-bundle.sh
index ac01936..d36cd7a 100755
--- a/build-bundle.sh
+++ b/flatpak/build-bundle.sh
@@ -1,12 +1,15 @@
 #! /bin/sh
 
 BUILD_DIR=build
-JSON=org.gnome.Recipes.flatpak.json
+JSON=org.gnome.Recipes.json
 REPO=repo
 
 echo "Removing build dir..."
 rm -rf $BUILD_DIR
 
+echo "Making repository..."
+ostree init --mode=archive-z2 --repo=$REPO
+
 echo "Building with flatpak-builder..."
 flatpak-builder --repo=$REPO $BUILD_DIR $JSON
 
diff --git a/flatpak/org.gnome.Recipes.json b/flatpak/org.gnome.Recipes.json
index 8e2ad6c..af38e72 100644
--- a/flatpak/org.gnome.Recipes.json
+++ b/flatpak/org.gnome.Recipes.json
@@ -63,13 +63,13 @@
                 },
                 {
                     "type": "patch",
-                    "path": "flatpak/meson-glib-check.patch",
+                    "path": "meson-glib-check.patch",
                     "strip-components": 0
 
                 },
                 {
                     "type": "file",
-                    "path": "flatpak/setuptools-makefile",
+                    "path": "setuptools-makefile",
                     "dest-filename": "Makefile"
                 }
             ]