use make, copy options (fixes new repo), update app.ini

3 files changed, 16 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f72bc7a3788..9570adcbb2dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gitea-git
 	pkgdesc = A painless self-hosted Git service.
-	pkgver = 4698.d0490c18
+	pkgver = 4706.6e5fffbd
 	pkgrel = 1
 	url = https://gitea.io/
 	install = gitea.install
@@ -11,6 +11,7 @@ pkgbase = gitea-git
 	license = MIT
 	makedepends = patch
 	makedepends = git
+	makedepends = go-bindata
 	depends = go
 	optdepends = mariadb: MariaDB database support
 	optdepends = postgresql: PostgreSQL database support
@@ -30,7 +31,7 @@ pkgbase = gitea-git
 	source = gitea.tmpfiles
 	sha256sums = SKIP
 	sha256sums = f7b570315bd98a4e2d1c82ebdc2e78d76f6df49286ca4ac59cfb2b3f9985d1f9
-	sha256sums = ec5398cd2ef1bf25bce2ad7f9cb260b43d6e6e9c4ebfb3228212979e36660280
+	sha256sums = 9748d8993198df218eeb2ad04b70d21393f0e9d5828d5e5c7d75334100c2dc6e
 	sha256sums = d8efbf6f1e634548a3ee875c9a7444282966ffe76f2ed9532ee7b724a364264b
 	sha256sums = 5631db5f47b41cdae180b98214e436856daec497949c68c1e13f70f12bbb855d
 
diff --git a/PKGBUILD b/PKGBUILD
index bc695f14cb8a..6a4646e3ec5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,24 +7,24 @@
 _pkgname=gitea
 _gourl="code.gitea.io"
 pkgname=gitea-git
-pkgver=4698.d0490c18
+pkgver=4706.6e5fffbd
 pkgrel=1
 pkgdesc='A painless self-hosted Git service.'
 url='https://gitea.io/'
 license=('MIT')
 source=('git://github.com/go-gitea/gitea.git#branch=master'
-'gitea.service.patch'
-'app.ini'
-'gitea.sysusers'
-'gitea.tmpfiles')
+        'gitea.service.patch'
+        'app.ini'
+        'gitea.sysusers'
+        'gitea.tmpfiles')
 sha256sums=('SKIP'
             'f7b570315bd98a4e2d1c82ebdc2e78d76f6df49286ca4ac59cfb2b3f9985d1f9'
-            'ec5398cd2ef1bf25bce2ad7f9cb260b43d6e6e9c4ebfb3228212979e36660280'
+            '9748d8993198df218eeb2ad04b70d21393f0e9d5828d5e5c7d75334100c2dc6e'
             'd8efbf6f1e634548a3ee875c9a7444282966ffe76f2ed9532ee7b724a364264b'
             '5631db5f47b41cdae180b98214e436856daec497949c68c1e13f70f12bbb855d')
 arch=('x86_64' 'i686' 'armv6h' 'armv7h')
 depends=('go')
-makedepends=('patch' 'git')
+makedepends=('patch' 'git' 'go-bindata')
 optdepends=('mariadb: MariaDB database support'
             'postgresql: PostgreSQL database support'
             'sqlite: SQLite database support'
@@ -43,12 +43,8 @@ pkgver() {
 }
 
 prepare() {
-  mkdir -p "${srcdir}/src/${_gourl}"
-  mv "${_pkgname}" "${srcdir}/src/${_gourl}/${_pkgname}"
-
-  # build with tags
-  msg2 "Build with tags"
-  GOPATH="${srcdir}" go get -tags "sqlite redis memcache" "${_gourl}/${_pkgname}"
+  mkdir -p "${srcdir}/src/${_gourl}/${_pkgname}"
+  mv "${srcdir}/gitea" "${srcdir}/src/${_gourl}"
 
   # patch
   msg2 "Patch gitea.service"
@@ -57,12 +53,11 @@ prepare() {
 
 build() {
   cd ${srcdir}/src/${_gourl}/${_pkgname}
-  GOPATH="${srcdir}" go fix
-  GOPATH="${srcdir}" go build -tags "sqlite redis memcache cert"
+  GOPATH="${srcdir}" LDFLAGS="" make DESTDIR="$pkgdir/" TAGS="sqlite tidb pam" clean generate build
 }
 
 package() {
-  install -dm755 ${pkgdir}/var/lib/${_pkgname}/{custom/conf,conf,data/{attachments,avatars,sessions,tmp},repo}
+  install -dm755 ${pkgdir}/var/lib/${_pkgname}/{custom/conf,conf,data/{attachments,avatars,sessions,tmp},options,repo}
   install -dm755 ${pkgdir}/var/log/gitea
   install -Dm755 "${srcdir}/src/${_gourl}/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
   install -Dm644 "${srcdir}/src/${_gourl}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
@@ -70,6 +65,6 @@ package() {
   install -Dm644 "${srcdir}/${_pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/gitea.conf"
   install -Dm644 "${srcdir}/${_pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/gitea.conf"
   install -Dm644 "${srcdir}/app.ini" "${pkgdir}/var/lib/${_pkgname}/custom/conf/app.ini"
-  cp -r ${srcdir}/src/${_gourl}/${_pkgname}/{conf,templates,public} ${pkgdir}/var/lib/${_pkgname}
-  cp -r ${srcdir}/src/${_gourl}/${_pkgname}/options/* ${pkgdir}/var/lib/${_pkgname}/conf
+  cp -r ${srcdir}/src/${_gourl}/${_pkgname}/{conf,templates,options,public} ${pkgdir}/var/lib/${_pkgname}
+  cp -r ${srcdir}/src/${_gourl}/${_pkgname}/options/locale ${pkgdir}/var/lib/${_pkgname}/conf
 }
diff --git a/app.ini b/app.ini
index 3e15840c358f..5a16dc538eee 100644
--- a/app.ini
+++ b/app.ini
@@ -1,6 +1,3 @@
-# NEVER EVER MODIFY THIS FILE
-# PLEASE MAKE CHANGES ON CORRESPONDING CUSTOM CONFIG FILE
-
 ; App name that shows on every page title
 APP_NAME = Gitea: Git with a cup of tea
 ; Change it if you run locally