libreoffice-online: improve packaging

2 files changed, 15 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a6e2928e991..f0a747ed4fe5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libreoffice-online
 	pkgdesc = HTML5-based/cloud-based version of the office suite
 	pkgver = 7.0.1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.libreoffice.org/download/libreoffice-online/
 	install = libreoffice-online.install
 	arch = x86_64
@@ -9,23 +9,22 @@ pkgbase = libreoffice-online
 	makedepends = cppunit
 	makedepends = git
 	makedepends = libreoffice-fresh-sdk
-	makedepends = nodejs
 	makedepends = npm
-	makedepends = openssl
-	makedepends = poco
 	makedepends = python-polib
-	depends = poco
-	depends = libreoffice-fresh
 	depends = cpio
+	depends = libreoffice-fresh
+	depends = nodejs
+	depends = openssl
+	depends = poco
 	backup = etc/libreoffice-online/loolwsd.xml
-	source = libreoffice-online::git+https://github.com/LibreOffice/online#tag=libreoffice-7.0.1.1
+	source = https://github.com/LibreOffice/online/archive/libreoffice-7.0.1.1.tar.gz
 	source = disable-fc-cache.patch
 	source = loolwsd-config.patch
 	source = loolwsd.service
 	source = libreoffice-online.install
 	source = libreoffice-online.sysusers
 	source = libreoffice-online.tmpfiles
-	sha512sums = SKIP
+	sha512sums = 092be634649fb28391ba1164343a8a26958159243455f9f98178d6ca3312d2c9b5e79738e8a557197b9fe545f5f01764cd57042c1fed3a1b11117ddab616f31c
 	sha512sums = f7a63c32480b71258bad023095cfaa58baf1477acdcda76fd54e63e33caccb071749cdf577af12a9d4c95a3cd22e5e98ad4e12531307d860322b84e5d8973f92
 	sha512sums = 4b2c91f4cdd27faa6d19683872baac1fac13d85d109b5d7c5be7116ecfeeab2e94bc67f1a02e0f108cdc18777cf9facd0e3c55186615cd5658f7723cdc57bf44
 	sha512sums = 285071cc43da05a1065434078f8fd1d8046ca3deed6e25ddcbead714665940c1c0033559b6b938430878420a564de3927f10f975ac066a6c94a0d5609b8523aa
diff --git a/PKGBUILD b/PKGBUILD
index 4d8c58027bb8..c46378d45be1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,15 +5,15 @@
 
 pkgname=libreoffice-online
 pkgver=7.0.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="HTML5-based/cloud-based version of the office suite"
 arch=('x86_64')
 url="https://www.libreoffice.org/download/libreoffice-online/"
 license=("MPL")
-makedepends=("cppunit" "git" "libreoffice-fresh-sdk" "nodejs" "npm" "openssl" "poco" "python-polib")
-depends=("poco" "libreoffice-fresh" "cpio")
+depends=("cpio" "libreoffice-fresh" "nodejs" "openssl" "poco")
+makedepends=("cppunit" "git" "libreoffice-fresh-sdk" "npm" "python-polib")
 backup=("etc/libreoffice-online/loolwsd.xml")
-source=("${pkgname}::git+https://github.com/LibreOffice/online#tag=libreoffice-${pkgver}"
+source=("https://github.com/LibreOffice/online/archive/libreoffice-${pkgver}.tar.gz"
   "disable-fc-cache.patch"
   "loolwsd-config.patch"
   "loolwsd.service"
@@ -21,7 +21,7 @@ source=("${pkgname}::git+https://github.com/LibreOffice/online#tag=libreoffice-$
   "libreoffice-online.sysusers"
   "libreoffice-online.tmpfiles")
 
-sha512sums=('SKIP'
+sha512sums=('092be634649fb28391ba1164343a8a26958159243455f9f98178d6ca3312d2c9b5e79738e8a557197b9fe545f5f01764cd57042c1fed3a1b11117ddab616f31c'
             'f7a63c32480b71258bad023095cfaa58baf1477acdcda76fd54e63e33caccb071749cdf577af12a9d4c95a3cd22e5e98ad4e12531307d860322b84e5d8973f92'
             '4b2c91f4cdd27faa6d19683872baac1fac13d85d109b5d7c5be7116ecfeeab2e94bc67f1a02e0f108cdc18777cf9facd0e3c55186615cd5658f7723cdc57bf44'
             '285071cc43da05a1065434078f8fd1d8046ca3deed6e25ddcbead714665940c1c0033559b6b938430878420a564de3927f10f975ac066a6c94a0d5609b8523aa'
@@ -32,13 +32,13 @@ sha512sums=('SKIP'
 install=libreoffice-online.install
 
 prepare() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/online-libreoffice-${pkgver}"
   patch -p1 <"${srcdir}/disable-fc-cache.patch"
   patch -p1 <"${srcdir}/loolwsd-config.patch"
 }
 
 build() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/online-libreoffice-${pkgver}"
   ./autogen.sh
 
   ./configure \
@@ -65,7 +65,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/online-libreoffice-${pkgver}"
   make DESTDIR="${pkgdir}" install
   mkdir -p "${pkgdir}/var/log" "${pkgdir}"/var/lib/{,cache}/libreoffice-online