update to 1.5.0

3 files changed, 16 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3fc942a8ac2f..712dae36f9cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gitea
 	pkgdesc = Git with a cup of tea, forked from Gogs. Is a Self Hosted Git Service in the Go Programming Language.
-	pkgver = 1.4.3
+	pkgver = 1.5.0
 	pkgrel = 1
 	url = http://gitea.io
 	arch = x86_64
@@ -11,6 +11,7 @@ pkgbase = gitea
 	arch = aarch64
 	license = MIT
 	makedepends = go
+	makedepends = go-bindata
 	depends = git
 	optdepends = sqlite: SQLite support
 	optdepends = mariadb: MariaDB support
@@ -22,12 +23,12 @@ pkgbase = gitea
 	conflicts = gitea-git
 	conflicts = gitea-git-dev
 	backup = etc/gitea/app.ini
-	source = https://github.com/go-gitea/gitea/archive/v1.4.3.tar.gz
+	source = https://github.com/go-gitea/gitea/archive/v1.5.0.tar.gz
 	source = gitea.tmpfiles
 	source = gitea.service
 	source = app.ini
-	sha512sums = 24498b418b9ddb14da5568a206e1fa0831c5789e0b64207f413c3b86e2a855052f7af80d3cb80549eaae6944e22af271c00f6308c66487c3be0dccf55a17976a
-	sha512sums = 042199a7c692a7a2b344f1af3bc1c84b8dea2e2609634e4cbf2d7d7964c23508d7cad772a39de50a1116bd8d85b597c9988dd3ef398a26c2df8189f3aa9f40ee
+	sha512sums = 06cbcadc138496abf500b8d219d0770c5f6b8af419f9c3733596ee7e20cb50235815433979b2b1daa0a6117e6eb84de9678667236549e018079c49b793f22d68
+	sha512sums = c5fa7ae2e251ef86f002b001b9c46528f5a39e118ec56bd72e69ae62e9674bd5ffd2b2762e078fdf16c6ae8991c18b33b91a16e4cc9922744bfab5bc3377c079
 	sha512sums = 485f627daee2eebbd081f44bce5686eb2ee373a0fb24616fa1940d275caf1a192b29ef20b236a99f5ace99922dbb19cdc0db39b761fa8002d6f4bebe625ae8db
 	sha512sums = 3d8439ad48621a4a87634588377d133ae13a9ce30830d140beee1d69e3d4d40f6c47df663e97620d88c42e892c7fc0845f4091574c6314bed53fd20c7416b949
 
diff --git a/PKGBUILD b/PKGBUILD
index b5c608658840..377839d456d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Frederik Schwan <frederik dot schwan at linux dot com>
 
 pkgname=gitea
-pkgver=1.4.3
+pkgver=1.5.0
 pkgrel=1
 pkgdesc='Git with a cup of tea, forked from Gogs. Is a Self Hosted Git Service in the Go Programming Language.'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='http://gitea.io'
 license=('MIT')
 depends=('git')
-makedepends=('go')
+makedepends=('go' 'go-bindata')
 optdepends=('sqlite: SQLite support'
             'mariadb: MariaDB support'
             'postgresql: PostgreSQL support'
@@ -22,35 +22,33 @@ source=(https://github.com/go-gitea/gitea/archive/v${pkgver}.tar.gz
         gitea.tmpfiles
         gitea.service
         app.ini)
-sha512sums=('24498b418b9ddb14da5568a206e1fa0831c5789e0b64207f413c3b86e2a855052f7af80d3cb80549eaae6944e22af271c00f6308c66487c3be0dccf55a17976a'
-            '042199a7c692a7a2b344f1af3bc1c84b8dea2e2609634e4cbf2d7d7964c23508d7cad772a39de50a1116bd8d85b597c9988dd3ef398a26c2df8189f3aa9f40ee'
+sha512sums=('06cbcadc138496abf500b8d219d0770c5f6b8af419f9c3733596ee7e20cb50235815433979b2b1daa0a6117e6eb84de9678667236549e018079c49b793f22d68'
+            'c5fa7ae2e251ef86f002b001b9c46528f5a39e118ec56bd72e69ae62e9674bd5ffd2b2762e078fdf16c6ae8991c18b33b91a16e4cc9922744bfab5bc3377c079'
             '485f627daee2eebbd081f44bce5686eb2ee373a0fb24616fa1940d275caf1a192b29ef20b236a99f5ace99922dbb19cdc0db39b761fa8002d6f4bebe625ae8db'
             '3d8439ad48621a4a87634588377d133ae13a9ce30830d140beee1d69e3d4d40f6c47df663e97620d88c42e892c7fc0845f4091574c6314bed53fd20c7416b949')
 
 prepare() {
   mkdir -p "${srcdir}/src/code.gitea.io"
-  ln -s "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/src/code.gitea.io/${pkgname}"
-  sed -i -e "s/\"main.Version.*$/\"main.Version=${pkgver}\"/" "${srcdir}/${pkgname}-${pkgver}/Makefile"
+  mv "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/src/code.gitea.io/${pkgname}"
 }
 
 build() {
   cd ${srcdir}/src/code.gitea.io/${pkgname}
-  GOPATH="${srcdir}" PATH="${PATH}:${GOPATH}/bin/" make DESTDIR="${pkgdir}" TAGS="sqlite tidb pam" clean generate build
+  # GOPATH="${srcdir}" make clean generate
+  GOPATH="${srcdir}" EXTRA_GOFLAGS="-gcflags all=-trimpath=${srcdir} -asmflags all=-trimpath=${srcdir}" \
+  make LDFLAGS="-X \"main.Version=${pkgver}\" -X \"main.Tags=\$(TAGS)\"" GOFLAGS="-v" TAGS="sqlite tidb pam" build
 }
 
 package() {
-  install -Dm644 "${srcdir}/gitea.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/gitea.conf"
-
   install -dm 750 "${pkgdir}/var/lib/gitea/"
-  install -dm 750 "${pkgdir}/var/lib/gitea/"{repos,tmp,attachments,data,indexer,conf}
+  install -dm 750 "${pkgdir}/var/lib/gitea/"{attachments,data,indexer,repos,tmp}
   install -dm 750 "${pkgdir}/var/log/gitea/"
   install -dm 775 "${pkgdir}/etc/gitea/"
 
   install -Dm755 "${srcdir}/src/code.gitea.io/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 "${srcdir}/gitea.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
   install -Dm644 "${srcdir}/src/code.gitea.io/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -Dm660 "${srcdir}/app.ini" "${pkgdir}/etc/gitea/app.ini"
 
-  cp -r "${srcdir}/src/code.gitea.io/${pkgname}/"{templates,options,public} "${pkgdir}/var/lib/${pkgname}"
-  cp -r "${srcdir}/src/code.gitea.io/${pkgname}/options/locale" "${pkgdir}/var/lib/${pkgname}/conf"
+  install -Dm644 "${srcdir}/gitea.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/gitea.conf"
+  install -Dm644 "${srcdir}/gitea.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
 }
diff --git a/gitea.tmpfiles b/gitea.tmpfiles
index 4e9a7bc64797..b1d9763407af 100644
--- a/gitea.tmpfiles
+++ b/gitea.tmpfiles
@@ -1,12 +1,8 @@
 d /var/lib/gitea 0750 git git
 d /var/lib/gitea/attachments 0750 git git
-d /var/lib/gitea/conf 0750 git git
 d /var/lib/gitea/data 0750 git git
 d /var/lib/gitea/indexer 0750 git git
-d /var/lib/gitea/options 0750 git git
-d /var/lib/gitea/public 0750 git git
 d /var/lib/gitea/repos 0750 git git
-d /var/lib/gitea/templates 0750 git git
 d /var/lib/gitea/tmp 0750 git git
 d /var/log/gitea 0750 git git
 d /etc/gitea 0775 root git