summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAinola2018-05-21 17:49:13 -0600
committerAinola2018-05-21 17:49:13 -0600
commitccd4b66dcd8963fb215d28a6f0fd2b158c501ccf (patch)
tree6a51baf895d48f4410feedb3d7225739918c931d
parente3b72a0ea02f0decc7cbb460e7e6cf4b70835183 (diff)
downloadaur-ccd4b66dcd8963fb215d28a6f0fd2b158c501ccf.tar.gz
apparently it's not python-utils, it's just the utils.py file
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD7
-rw-r--r--python_utils_import.patch11
3 files changed, 4 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0ee9d32cfd7..7739a36aeeb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon May 21 23:37:25 UTC 2018
+# Mon May 21 23:48:47 UTC 2018
pkgbase = gam
pkgdesc = Command line tool for Google G Suite Administrators to manage domain and user settings quickly and easily.
pkgver = 4.40
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/jay0lee/GAM
arch = any
license = Apache
@@ -13,15 +13,12 @@ pkgbase = gam
depends = python2-simplejson
depends = python2-gdata
depends = python2-google-auth
- depends = python2-utils
depends = perl-mozilla-ca
source = https://github.com/jay0lee/GAM/archive/v4.40.tar.gz
source = python2.patch
- source = python_utils_import.patch
source = gam.sh
sha256sums = 01ce48e0ac79f35ba6c891e54156c67af232f210e98dea2b3178186659064ee0
sha256sums = 417f05ee7da33763f56b7b148f46564859133ececbd5a847cd3396a9802d5944
- sha256sums = 4ab006cec39b8d2307cd338d6ff09b4621e3a4abcd0e1362f26a47de9539e9db
sha256sums = d93809852ef9eefeb99f3fc1b955305264f93f2552db14b4d9d6fe7c2b08345b
pkgname = gam
diff --git a/PKGBUILD b/PKGBUILD
index db6d84a2a8a..19e881220d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=gam
pkgver=4.40
-pkgrel=1
+pkgrel=2
pkgdesc="Command line tool for Google G Suite Administrators to manage domain and user settings quickly and easily."
arch=('any')
url="https://github.com/jay0lee/GAM"
@@ -15,23 +15,19 @@ depends=(
'python2-simplejson'
'python2-gdata'
'python2-google-auth'
- 'python2-utils'
'perl-mozilla-ca'
)
source=(
"https://github.com/jay0lee/GAM/archive/v${pkgver}.tar.gz"
"python2.patch"
- "python_utils_import.patch"
"gam.sh"
)
sha256sums=('01ce48e0ac79f35ba6c891e54156c67af232f210e98dea2b3178186659064ee0'
'417f05ee7da33763f56b7b148f46564859133ececbd5a847cd3396a9802d5944'
- '4ab006cec39b8d2307cd338d6ff09b4621e3a4abcd0e1362f26a47de9539e9db'
'd93809852ef9eefeb99f3fc1b955305264f93f2552db14b4d9d6fe7c2b08345b')
prepare(){
patch -i "$srcdir/python2.patch" -d "$srcdir/GAM-$pkgver/src/"
- patch -i "$srcdir/python_utils_import.patch" -d "$srcdir/GAM-$pkgver/src/"
}
package() {
@@ -41,6 +37,7 @@ package() {
touch "$pkgdir/etc/$pkgname/nobrowser.txt"
install -Dm755 "$srcdir/GAM-$pkgver/src/gam.py" "$pkgdir/usr/share/$pkgname/gam.py"
install -Dm644 "$srcdir/GAM-$pkgver/src/var.py" "$pkgdir/usr/share/$pkgname/var.py"
+ install -Dm644 "$srcdir/GAM-$pkgver/src/utils.py" "$pkgdir/usr/share/$pkgname/utils.py"
install -Dm755 "$srcdir/gam.sh" "$pkgdir/usr/bin/gam"
ln -s /usr/share/perl5/vendor_perl/Mozilla/CA/cacert.pem \
diff --git a/python_utils_import.patch b/python_utils_import.patch
deleted file mode 100644
index d31b93d1748..00000000000
--- a/python_utils_import.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gam.py 2017-12-21 08:12:46.000000000 -0700
-+++ gam.py 2018-05-21 17:30:01.345278208 -0600
-@@ -52,7 +52,7 @@
- import oauth2client.file
- import oauth2client.tools
-
--import utils
-+import python_utils as utils
- from var import *
-
- # Override some oauth2client.tools strings saving us a few GAM-specific mods to oauth2client