add python2-crcmod optdep, remove symlink conflict

2 files changed, 8 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 23ed2c37bd89..52b8deadda30 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Sep  3 14:18:57 UTC 2016
+# Sun Sep  4 14:13:24 UTC 2016
 pkgbase = google-cloud-sdk
 	pkgdesc = Contains tools and libraries that enable you to easily create and manage resources on Google Cloud Platform
 	pkgver = 124.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cloud.google.com/sdk/
 	arch = i686
 	arch = x86_64
@@ -13,6 +13,7 @@ pkgbase = google-cloud-sdk
 	optdepends = go: for Go version of App Engine
 	optdepends = java-environment: for Java version of App Engine
 	optdepends = php: for PHP version of App Engine
+	optdepends = python2-crcmod: verify the integrity of object contents
 	options = !strip
 	options = staticlibs
 	source_i686 = https://dl.google.com/dl/cloudsdk/release/downloads/google-cloud-sdk-124.0.0-linux-x86.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index f9011c0ba161..82232574484f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname="google-cloud-sdk"
 pkgver=124.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Contains tools and libraries that enable you to easily create and manage resources on Google Cloud Platform"
 url="https://cloud.google.com/sdk/"
 license=("Apache")
@@ -14,7 +14,8 @@ depends=('python2')
 makedepends=('python2')
 optdepends=('go: for Go version of App Engine'
             'java-environment: for Java version of App Engine'
-            'php: for PHP version of App Engine')
+            'php: for PHP version of App Engine'
+            'python2-crcmod: verify the integrity of object contents')
 options=('!strip' 'staticlibs')
 
 # 64bit
@@ -85,6 +86,8 @@ package() {
     "/opt/$pkgname/bin/%f\n" | xargs ln -st "$pkgdir/usr/bin"
   # this conflicts with google-appengine-python
   rm -f "$pkgdir/usr/bin/dev_appserver.py"
+  # this conflicts with google-appengine-python-php
+  rm -f "$pkgdir/usr/bin/endpointscfg.py"
 
   # The tarball is rather sloppy with it's file permissions
   msg2 "Fixing file permissions"