flatpak/build.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
New commits: commit 5b74887961f1a3941933090eebdb8bdb6369c3a6 Author: Stephan Bergmann <[email protected]> Date: Fri May 27 09:05:18 2016 +0200 flatpak/build.sh: Use gpg2 The TDF key I have only works in "flatpak build-export" when imported with gpg2 instead of gpg (flatpak otherwise fails with an "error: Failure signing commit file: GPGME: General error", even though a plain "gpg --sign" works fine; go figure), but then it can also only be exported with gpg2. diff --git a/flatpak/build.sh b/flatpak/build.sh index 25e84e7..8ceb5c6 100755 --- a/flatpak/build.sh +++ b/flatpak/build.sh @@ -135,7 +135,7 @@ flatpak build-update-repo --title='The Document Foundation LibreOffice Fresh' \ --gpg-sign="${my_gpgkeyid?}" "${my_dir?}"/repository tar --create --file "${my_dir?}"/repository.tgz --gzip \ --directory="${my_dir?}" repository -gpg --homedir="${my_gpghomedir?}" --output="${my_dir?}"/key --export \ +gpg2 --homedir="${my_gpghomedir?}" --output="${my_dir?}"/key --export \ "${my_gpgkeyid?}" flatpak build-bundle \ --repo-url=http://download.documentfoundation.org/libreoffice/flatpack/repository \ commit 7bf845c30a54cad29ece907da65c4d76bfae27ec Author: Stephan Bergmann <[email protected]> Date: Thu May 26 13:17:13 2016 +0200 flatpak/build.sh: Generate repository.tgz diff --git a/flatpak/build.sh b/flatpak/build.sh index e928d1b..25e84e7 100755 --- a/flatpak/build.sh +++ b/flatpak/build.sh @@ -129,13 +129,15 @@ flatpak build-finish --command=/app/libreoffice/program/soffice \ --socket=system-bus --socket=session-bus --filesystem=host \ --env=LIBO_FLATPAK=1 "${my_dir?}"/app flatpak build-export --gpg-homedir="${my_gpghomedir?}" \ - --gpg-sign="${my_gpgkeyid?}" "${my_dir?}"/repo "${my_dir?}"/app + --gpg-sign="${my_gpgkeyid?}" "${my_dir?}"/repository "${my_dir?}"/app flatpak build-update-repo --title='The Document Foundation LibreOffice Fresh' \ --generate-static-deltas --prune --gpg-homedir="${my_gpghomedir?}" \ - --gpg-sign="${my_gpgkeyid?}" "${my_dir?}"/repo + --gpg-sign="${my_gpgkeyid?}" "${my_dir?}"/repository +tar --create --file "${my_dir?}"/repository.tgz --gzip \ + --directory="${my_dir?}" repository gpg --homedir="${my_gpghomedir?}" --output="${my_dir?}"/key --export \ "${my_gpgkeyid?}" flatpak build-bundle \ --repo-url=http://download.documentfoundation.org/libreoffice/flatpack/repository \ - --gpg-keys="${my_dir?}"/key "${my_dir?}"/repo \ + --gpg-keys="${my_dir?}"/key "${my_dir?}"/repository \ "${my_dir?}"/LibreOffice.flatpak org.libreoffice.LibreOffice commit 5b5739d504a09b90ef15f34af4d16832b499631b Author: Stephan Bergmann <[email protected]> Date: Thu May 26 13:05:57 2016 +0200 flatpak/build.sh: Fixed --repo-url diff --git a/flatpak/build.sh b/flatpak/build.sh index 9cef544..e928d1b 100755 --- a/flatpak/build.sh +++ b/flatpak/build.sh @@ -24,9 +24,6 @@ # # TODO: # -# * Fix the --repo-url=http://libreoffice.org/TODO URL in the build-bundle -# step. -# # * Explicitly specify the --arch to build? @@ -138,6 +135,7 @@ flatpak build-update-repo --title='The Document Foundation LibreOffice Fresh' \ --gpg-sign="${my_gpgkeyid?}" "${my_dir?}"/repo gpg --homedir="${my_gpghomedir?}" --output="${my_dir?}"/key --export \ "${my_gpgkeyid?}" -flatpak build-bundle --repo-url=http://libreoffice.org/TODO \ +flatpak build-bundle \ + --repo-url=http://download.documentfoundation.org/libreoffice/flatpack/repository \ --gpg-keys="${my_dir?}"/key "${my_dir?}"/repo \ "${my_dir?}"/LibreOffice.flatpak org.libreoffice.LibreOffice _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
