update, clean chrro, depends on oracle-instantclient-baisc from [oracle].

2 files changed, 39 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0690a16ba510..53143557e514 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,20 @@
 pkgbase = python-cx_oracle-git
 	pkgdesc = Python extension module that allows access to Oracle databases
-	pkgver = 6.1.r19.dbe9e45
+	pkgver = 7.1.2.r0.c1e1659
 	pkgrel = 1
-	url = https://github.com/oracle/python-cx_Oracle
+	url = https://github.com/oracle/python-cx_Oracle.git
 	arch = i686
 	arch = x86_64
 	license = Python
 	checkdepends = python-nose
 	checkdepends = python2-nose
+	makedepends = git
 	makedepends = python
 	makedepends = python2
-	source = python-cx_oracle-git::git+https://github.com/oracle/python-cx_Oracle
+	makedepends = python-setuptools
+	makedepends = python2-setuptools
+	makedepends = oracle-instantclient-basic
+	source = python-cx_oracle-git::git+https://github.com/oracle/python-cx_Oracle.git#tag=7.1.2
 	md5sums = SKIP
 
 pkgname = python-cx_oracle-git
diff --git a/PKGBUILD b/PKGBUILD
index 9f00fa2e34ab..c8cc25382926 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,38 @@
-# Mantainer: Andres Alejandro Navarro Alsina
+# Mantainer: Andres Alejandro Navarro Alsina <aanavarroa@unal.edu.co>
 # Contributor: Michael Kapelko <kornerr@gmail.com>
 # Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
 # Contributor: David H. Bronke <whitelynx@gmail.com>
 # Contributor: Andrea Ratto <andrearatto_liste@yahoo.it>
 pkgbase=python-cx_oracle-git
 pkgname=('python-cx_oracle-git' 'python2-cx_oracle-git')
-pkgver=6.1.r19.dbe9e45
+pkgver=7.1.2.r0.c1e1659
 pkgrel=1
 pkgdesc="Python extension module that allows access to Oracle databases"
 arch=('i686' 'x86_64')
-url='https://github.com/oracle/python-cx_Oracle'
+url='https://github.com/oracle/python-cx_Oracle.git'
 license=('Python')
-makedepends=('python' 'python2')
+makedepends=('git' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'oracle-instantclient-basic')
 checkdepends=('python-nose' 'python2-nose')
-source=("${pkgbase}::git+${url}")
+source=("${pkgbase}::git+${url}#tag=7.1.2")
 md5sums=('SKIP')
 
+msg "Warning: The package oracle-instantclient-basic must be installed manually "
+plain "unofficial prebuilt Arch packages are available by adding the"
+plain "following lines to /etc/pacman.conf, if you agree to the Oracle licence[1]:"
+plain ""
+plain "  [oracle]"
+plain "  SigLevel = Optional TrustAll"
+plain '  Server = http://linux.shikadi.net/arch/$repo/$arch/'
+plain ""
+plain "Then run 'pacman -Sys oracle' to see available packages."
+plain ""
+plain "[1]: http://www.oracle.com/technetwork/licenses/instant-client-lic-152016.html"
+plain ""
+
+
 pkgver() {
   	 cd "${pkgbase}"
-	 printf "%s" "$(git describe --long --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+	 printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 	 #printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
@@ -28,27 +42,29 @@ prepare() {
 
 build() {
 	cd "$srcdir"/$pkgbase
-	rm -r odpi
-	git clone https://github.com/oracle/python-cx_Oracle
+	#rm -r odpi
+	git clone https://github.com/oracle/odpi.git odpi
+	#cd cx_Oracle
 	git submodule init
 	git submodule update
 	python setup.py build
 
 	cd  "$srcdir"/$pkgbase-py2
-	rm -r odpi
-	git clone https://github.com/oracle/python-cx_Oracle
+	#rm -r odpi
+	git clone https://github.com/oracle/odpi.git odpi
+	#cd cx_Oracle2
 	git submodule init
 	git submodule update
 	python2 setup.py build
 }
 
-check() {
-	cd "$srcdir"/$pkgbase/test
-	nosetests -v || warning 'Tests failed'
+#check() {
+#	cd "$srcdir"/$pkgbase
+#	python setup.py test || warning 'Tests failed'
 
-	cd "$srcdir"/$pkgbase-py2/test
-	nosetests2 -v || warning 'Tests failed'
-}
+#	cd "$srcdir"/$pkgbase-py2
+#	python2 setup.py test || warning 'Tests2 failed'
+#}
 
 
 package_python-cx_oracle-git() {