[arch-commits] Commit in aliyun-cli/trunk (PKGBUILD)

[Levente Polyak]

    Date: Saturday, June 13, 2020 @ 13:52:35
  Author: anthraxx
Revision: 642854

upgpkg: aliyun-cli 3.0.46-1

Modified:
  aliyun-cli/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-13 11:59:56 UTC (rev 642853)
+++ PKGBUILD	2020-06-13 13:52:35 UTC (rev 642854)
@@ -2,9 +2,8 @@
 # Contributor: Andreas 'Segaja' Schleifer <archlinux at segaja dot de>
 
 pkgname=aliyun-cli
-pkgver=3.0.42
-_jteeuwen_go_bindata_commit=6025e8de665b31fa74ab1a66f2cddd8c0abf887e
-_aliyun_openapi_meta_commit=8ee9c7a0cd24e45f5f729c98395b944b4cc89e4a
+pkgver=3.0.46
+_aliyun_openapi_meta_commit=5f5f2b9649e360a1ae3426207a514dbd0bd8a2df
 pkgrel=1
 pkgdesc='Alibaba Cloud CLI'
 arch=('x86_64')
@@ -13,25 +12,18 @@
 depends=('glibc' 'jq')
 makedepends=('git' 'go' 'go-bindata')
 source=(${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
-        "git+https://github.com/aliyun/aliyun-openapi-meta#commit=${_aliyun_openapi_meta_commit}"
-        "jteeuwen-go-bindata::git+https://github.com/jteeuwen/go-bindata#commit=${_jteeuwen_go_bindata_commit}")
-sha512sums=('b446d55254db7628004440da8b7fe8c43e382f6fd7712490c656e0e05048eea3377155f867d9fb9d16b06e585d2e0eddf94e6c5ebc1e3bd43b32473f2e84f641'
-            'SKIP'
+        "git+https://github.com/aliyun/aliyun-openapi-meta#commit=${_aliyun_openapi_meta_commit}")
+sha512sums=('55722630d8ec6ae300458a98eba29a3df40acef72c51c427252722294ef273c40e4a58942b07ac9db8410f74f096b712fb86858a9b66ed5cf3f9f777ffc9afd2'
             'SKIP')
-b2sums=('60eeace414f8ebab48f839599d8ba864f570014d32fa50ca9544209479c47e339bb6c50cb1c2d3cc41ca7b6f1e895f1ea3768718504740cf178ea0615d105d25'
-        'SKIP'
+b2sums=('42aacc3af9e57d08ab8defd6cd7a8e9582c7b8f59e13648c631ce380c8c35d6a00665e69af3791089b7e8dd92c3f00b4c3ccf091130642ccb864b17daab895b2'
         'SKIP')
 
 prepare() {
   export GOPATH="${srcdir}/go"
 
-  mkdir -p "${GOPATH}/src/github.com/"{aliyun,jteeuwen}
+  mkdir -p "${GOPATH}/src/github.com/aliyun"
   ln -rTsf "${pkgname}-${pkgver}" "${GOPATH}/src/github.com/aliyun/${pkgname}"
   ln -rTsf aliyun-openapi-meta "${GOPATH}/src/github.com/aliyun/aliyun-openapi-meta"
-
-  # for now we can't use the go-bindata package as this breaks the resulting binary.
-  # The issue has been reported upstream: https://github.com/aliyun/aliyun-cli/issues/262
-  ln -rTsf jteeuwen-go-bindata "${GOPATH}/src/github.com/jteeuwen/go-bindata"
 }
 
 build() {
@@ -46,10 +38,6 @@
   export CGO_CXXFLAGS="${CXXFLAGS}"
   export GOFLAGS="-buildmode=pie -trimpath -mod=vendor"
 
-  #pushd "${srcdir}/jteeuwen-go-bindata/go-bindata"
-  #go build
-  #popd
-
   go-bindata \
       -o resource/metas.go \
       -pkg resource \