Updated packages python2-jpype1 0.6.3-3

2 files changed, 12 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e424c50d09f..2b2bd00152ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,15 @@
-# Generated by mksrcinfo v8
-# Sat Aug 11 20:36:24 UTC 2018
 pkgbase = python2-jpype1
 	pkgdesc = Python to Java bridge, an effort to allow Python programs full access to Java class libraries
 	pkgver = 0.6.3
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/jpype-project/jpype
 	arch = x86_64
 	license = APACHE
-	makedepends = python-setuptools
 	makedepends = python2-setuptools
+	depends = python2
 	conflicts = jpype
 	source = JPype1-0.6.3.tar.gz::https://github.com/jpype-project/jpype/archive/v0.6.3.tar.gz
 	sha256sums = 5c447f4ac2d97f60ee1753fa59dd32ebdc29e16571db9ce2fb7a67362d459e22
 
-pkgname = python-jpype1
-	depends = python
-
 pkgname = python2-jpype1
-	depends = python2
 
diff --git a/PKGBUILD b/PKGBUILD
index e0f7923c583f..16b7aaa4d480 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,47 +2,27 @@
 # Contributor: NicoHood <archlinux {cat} nicohood {dog} de>
 # Contributor: Jonathan Liu <net147@gmail.com>
 
-pkgbase=python2-jpype1
-pkgname=('python-jpype1' 'python2-jpype1')
-_pkgname=jpype1
+pkgname=python2-jpype1
+_pkgname=jpype
 pkgver=0.6.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Python to Java bridge, an effort to allow Python programs full access to Java class libraries"
 arch=('x86_64')
-url="https://github.com/jpype-project/jpype"
+url="https://github.com/jpype-project/${_pkgname}"
 license=('APACHE')
-makedepends=('python-setuptools' 'python2-setuptools')
+makedepends=('python2-setuptools')
+depends=('python2')
 conflicts=('jpype')
-source=("JPype1-${pkgver}.tar.gz"::"https://github.com/jpype-project/jpype/archive/v${pkgver}.tar.gz")
+source=("JPype1-${pkgver}.tar.gz"::"https://github.com/jpype-project/${_pkgname}/archive/v${pkgver}.tar.gz")
 sha256sums=('5c447f4ac2d97f60ee1753fa59dd32ebdc29e16571db9ce2fb7a67362d459e22')
 
-prepare() {
-  # Create a copy of the original source to build for specific python versions
-  cp -r "jpype-${pkgver}" "python-${_pkgname}-${pkgver}"
-  cp -r "jpype-${pkgver}" "python2-${_pkgname}-${pkgver}"
-}
-
 build() {
-  cd "${srcdir}/python-${_pkgname}-${pkgver}"
-  echo "Building Python 3.x version"
-  python setup.py build
-
-  cd "${srcdir}/python2-${_pkgname}-${pkgver}"
-  echo "Building Python 2.x version"
+  cd "${_pkgname}-${pkgver}"
   python2 setup.py build
 }
 
-package_python-jpype1() {
-  depends=('python')
-
-  cd "${pkgname}-${pkgver}"
-  python setup.py install --root="${pkgdir}" --optimize=1
-}
-
-package_python2-jpype1() {
-  depends=('python2')
-
-  cd "${pkgname}-${pkgver}"
+package() {
+  cd "${_pkgname}-${pkgver}"
   python2 setup.py install --root="${pkgdir}" --optimize=1
 }