Fix branch and avoid copying of the .git directory

Also, correct license.

2 files changed, 22 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4311fac371f8..960b1abbda66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 pkgbase = mediawiki-extension-pluggableauth-git
 	pkgdesc = A Framework for creating authentication and authorization extensions
-	pkgver = 5.7.r9.g36e0a37
+	pkgver = 5.7.r10.g17fb1ea
 	pkgrel = 1
+	epoch = 1
 	url = https://www.mediawiki.org/wiki/Extension:PluggableAuth
 	arch = any
-	license = GPL
+	license = MIT
 	makedepends = git
-	depends = mediawiki
+	depends = mediawiki>=1.34
+	depends = mediawiki<1.35
 	provides = mediawiki-extension-pluggableauth
 	conflicts = mediawiki-extension-pluggableauth
-	source = git+https://gerrit.wikimedia.org/r/mediawiki/extensions/PluggableAuth
+	source = git+https://gerrit.wikimedia.org/r/mediawiki/extensions/PluggableAuth#branch=REL1_34
 	sha512sums = SKIP
 
 pkgname = mediawiki-extension-pluggableauth-git
diff --git a/PKGBUILD b/PKGBUILD
index b47b4bba11d2..27ed65ef9b49 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,18 +4,24 @@ _extname=PluggableAuth
 _extname_lowercase="${_extname,,}"
 _pkgname_base="mediawiki-extension-${_extname_lowercase}"
 
+_mediawiki_mainver=1.34
+_mediawiki_mainver_succ=${_mediawiki_mainver%.*}.$((${_mediawiki_mainver##*.}+1))
+_branch="REL${_mediawiki_mainver/./_}"
+
 pkgname="${_pkgname_base}-git"
-pkgver=5.7.r9.g36e0a37
+epoch=1
+pkgver=5.7.r10.g17fb1ea
 pkgrel=1
 pkgdesc="A Framework for creating authentication and authorization extensions"
 arch=('any')
 url="https://www.mediawiki.org/wiki/Extension:${_extname}"
-license=('GPL')
-depends=('mediawiki')
+license=('MIT')
+depends=("mediawiki>=${_mediawiki_mainver}"
+         "mediawiki<${_mediawiki_mainver_succ}")
 makedepends=('git')
 provides=("$_pkgname_base")
 conflicts=("$_pkgname_base")
-source=("git+https://gerrit.wikimedia.org/r/mediawiki/extensions/${_extname}")
+source=("git+https://gerrit.wikimedia.org/r/mediawiki/extensions/${_extname}#branch=${_branch}")
 sha512sums=('SKIP')
 
 pkgver()
@@ -26,8 +32,11 @@ pkgver()
 
 package()
 {
-	local ext_dir="${pkgdir}/usr/share/webapps/mediawiki/extensions"
+	local ext_dir="/usr/share/webapps/mediawiki/extensions/${_extname}"
+
+	install -d -m755 "${pkgdir}${ext_dir}"
+	cp -a "$_extname"/* "${pkgdir}${ext_dir}/"
 
-	install -d -m755 "$ext_dir"
-	cp -a "$_extname" "${ext_dir}/"
+	install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+	ln -s "${ext_dir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/"
 }