Update to version 1.7, drop python2 support

3 files changed, 52 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8396bb1b090c..3cf157cfce0b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,21 @@
 pkgbase = python-adminapi-git
 	pkgdesc = Adminapi is a python module which can be used to talk to the open source serveradmin project by Innogames
-	pkgver = 1.4.3.r1996.17ad381
+	pkgver = 1.7.0.r2052.d7444ee
 	pkgrel = 1
 	url = https://github.com/InnoGames/serveradmin
 	arch = any
 	license = MIT
 	makedepends = python-setuptools
 	makedepends = python2-setuptools
-	source = adminapi::git+https://github.com/InnoGames/serveradmin.git
-	sha1sums = SKIP
-
-pkgname = python-adminapi-git
 	depends = python
 	depends = python-ipaddress
 	depends = python-netaddr
-	provides = python2-adminapi
-	conflicts = python2-adminapi
+	provides = python-adminapi
+	conflicts = python-adminapi
+	source = adminapi::git+https://github.com/InnoGames/serveradmin.git
+	source = adminapi-only.patch
+	sha256sums = SKIP
+	sha256sums = 086a0f7a7b935b27e1ece35d99202b4db10f6b5a4406dd45affba2bfaf89a08e
 
-pkgname = python2-adminapi-git
-	depends = python2
-	depends = python2-ipaddress
-	depends = python2-netaddr
-	provides = python2-adminapi
-	conflicts = python2-adminapi
+pkgname = python-adminapi-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6f84258ca6e7..20dca3f05aa9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,39 @@
 # Maintainer: Mikhail felixoid Shiryaev mr<dot>felixoid<at>gmail<dot>com
 
 _name=adminapi
-pkgbase="python-${_name}-git"
-pkgname=("python-${_name}-git" "python2-${_name}-git")
-pkgver=1.4.3.r1996.17ad381
+_srcname=serveradmin
+pkgname="python-${_name}-git"
+pkgver=1.7.0.r2052.d7444ee
 pkgrel=1
 pkgdesc='Adminapi is a python module which can be used to talk to the open source serveradmin project by Innogames'
 arch=('any')
-url="https://github.com/InnoGames/serveradmin"
+url="https://github.com/InnoGames/${_srcname}"
 makedepends=('python-setuptools' 'python2-setuptools')
+depends=('python' 'python-ipaddress' 'python-netaddr')
+provides=('python-adminapi')
+conflicts=('python-adminapi')
 license=('MIT')
-source=("${_name}::git+${url}.git")
-sha1sums=('SKIP')
+source=(
+  "${_name}::git+${url}.git"
+  'adminapi-only.patch'
+)
+sha256sums=(
+  'SKIP'
+  '086a0f7a7b935b27e1ece35d99202b4db10f6b5a4406dd45affba2bfaf89a08e'
+)
 
 pkgver() {
-	cd "${_name}"
-	_version=$(python setup.py -V)
-	( set -o pipefail
-		git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-		printf "%s.r%s.%s" "${_version}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-	)
-}
-
-package_python2-adminapi-git() {
-	depends=('python2' 'python2-ipaddress' 'python2-netaddr')
-    provides=("python2-${_name}")
-    conflicts=("python2-${_name}")
-	cd "${srcdir}/${_name}"
-	python2 setup.py install --root="${pkgdir}" --optimize=1
-	mv "${pkgdir}/usr/bin/${_name}"  "${pkgdir}/usr/bin/${_name}2"
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"LICENSE
+  cd "${_name}"
+  _version=$(python setup.py -V)
+  ( set -o pipefail
+    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "%s.r%s.%s" "${_version}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
 }
 
 package_python-adminapi-git() {
-	depends=('python' 'python-ipaddress' 'python-netaddr')
-    provides=("python2-${_name}")
-    conflicts=("python2-${_name}")
-	cd "${srcdir}/${_name}"
-	python setup.py install --root="${pkgdir}" --optimize=1
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"LICENSE
+  cd "${srcdir}/${_name}"
+  patch < ../adminapi-only.patch
+  python setup.py install --root="${pkgdir}" --optimize=1
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"LICENSE
 }
diff --git a/adminapi-only.patch b/adminapi-only.patch
new file mode 100644
index 000000000000..f82914e45600
--- /dev/null
+++ b/adminapi-only.patch
@@ -0,0 +1,19 @@
+--- a/setup.py	2019-11-24 23:12:47.120782692 +0100
++++ b/setup.py	2019-11-24 23:14:51.695064193 +0100
+@@ -14,7 +14,7 @@
+         name='adminapi',
+         description='Serveradmin module',
+         url='https://github.com/innogames/serveradmin',
+-        packages=find_packages(exclude=["serveradmin_*"]),
++        packages=find_packages(include=['adminapi*']),
+         package_data={
+             'serveradmin.api': ['templates/api/*'],
+             'serveradmin.apps': ['templates/apps/*'],
+@@ -43,7 +43,6 @@
+         },
+         entry_points={
+             'console_scripts': [
+-                'serveradmin=serveradmin.__main__:main',
+                 'adminapi=adminapi.__main__:main',
+             ],
+         },