Do not rename the source clone

2 files changed, 11 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9f3b2c30293..eab7f93def2e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = caffe-git
 	pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (cpu only, git version)
 	pkgver = 1.0.r132.g99bd99795
-	pkgrel = 5
+	pkgrel = 6
 	url = https://caffe.berkeleyvision.org/
 	arch = i686
 	arch = x86_64
@@ -44,7 +44,7 @@ pkgbase = caffe-git
 	conflicts = caffe
 	conflicts = caffe-cpu-git
 	replaces = caffe-cpu-git
-	source = caffe-git::git+https://github.com/BVLC/caffe.git
+	source = git+https://github.com/BVLC/caffe.git
 	source = Makefile.config
 	sha256sums = SKIP
 	sha256sums = dfa45f0d358b75c28049602d68d6468478c39d45518d584290af76d4ef74738e
diff --git a/PKGBUILD b/PKGBUILD
index b28a16f8975a..0f66700adeb2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,9 @@
 # Contributor: Jonathan Yantis
 
 pkgname=caffe-git
+_srcname=caffe
 pkgver=1.0.r132.g99bd99795
-pkgrel=5
+pkgrel=6
 pkgdesc='A deep learning framework made with expression, speed, and modularity in mind (cpu only, git version)'
 arch=('i686' 'x86_64')
 url='https://caffe.berkeleyvision.org/'
@@ -27,24 +28,24 @@ makedepends=('git' 'boost' 'doxygen' 'texlive-core')
 provides=('caffe' 'caffe-cpu-git')
 conflicts=('caffe' 'caffe-cpu-git')
 replaces=('caffe-cpu-git')
-source=("$pkgname"::'git+https://github.com/BVLC/caffe.git'
+source=('git+https://github.com/BVLC/caffe.git'
         'Makefile.config')
 sha256sums=('SKIP'
             'dfa45f0d358b75c28049602d68d6468478c39d45518d584290af76d4ef74738e')
 
 prepare() {
-    cp -af "${srcdir}/Makefile.config" "${srcdir}/${pkgname}"
+    cp -af "${srcdir}/Makefile.config" "${srcdir}/${_srcname}"
 }
 
 pkgver() {
-    cd "$pkgname"
+    cd "$_srcname"
     
     # git, tags available
     git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    cd "$pkgname"
+    cd "$_srcname"
     
     make all pycaffe
     rm -rf doxygen
@@ -52,12 +53,12 @@ build() {
 }
 
 check() {
-    cd "$pkgname"
+    cd "$_srcname"
     make test runtest
 }
 
 package() {
-    cd "${pkgname}/distribute"
+    cd "${_srcname}/distribute"
     
     local _pythonver
     _pythonver="$(python -c 'import sys; print("%s.%s" %sys.version_info[0:2])')"
@@ -81,7 +82,7 @@ package() {
     # proto
     install -D -m644 proto/caffe.proto -t "${pkgdir}/usr/share/caffe"
     
-    cd "${srcdir}/${pkgname}"
+    cd "${srcdir}/${_srcname}"
     
     # docs
     cp -a doxygen/html "${pkgdir}/usr/share/doc/${pkgname}"