[Libreoffice-commits] dev-tools.git: flatpak/build.sh

[Stephan Bergmann]

 flatpak/build.sh |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8ea47acc0ee524c1142db46c21db5556ad815dc8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Aug 21 16:00:49 2017 +0200

    Move branch specification out of the manifest file
    
    ...in order to harmonize this manifest file with the one in
    ramcq/libreoffice-flatpak on github.com

diff --git a/flatpak/build.sh b/flatpak/build.sh
index 62b9ce0..6ddfc7f 100755
--- a/flatpak/build.sh
+++ b/flatpak/build.sh
@@ -50,7 +50,6 @@ rm -f "${my_dir?}"/manifest.json
 cat > "${my_dir?}"/manifest.json <<EOF
 {
     "id": "org.libreoffice.LibreOffice",
-    "branch": "${my_flatpakbranch?}",
     "runtime": "org.gnome.Platform",
     "runtime-version": "3.24",
     "sdk": "org.gnome.Sdk",
@@ -96,9 +95,10 @@ cat > "${my_dir?}"/manifest.json <<EOF
 }
 EOF
 
-flatpak-builder --repo="${my_dir?}"/repository \
- --gpg-homedir="${my_gpghomedir?}" --gpg-sign="${my_gpgkeyid?}" --force-clean \
- "${my_dir?}"/app "${my_dir?}"/manifest.json
+flatpak-builder --default-branch="${my_flatpakbranch?}" \
+ --repo="${my_dir?}"/repository --gpg-homedir="${my_gpghomedir?}" \
+ --gpg-sign="${my_gpgkeyid?}" --force-clean "${my_dir?}"/app \
+ "${my_dir?}"/manifest.json
 
 ## --prune-depth=1 leaves the one most recent older revision available; that
 ## keeps the repo from growing without bounds, but for one allows users to roll