Update to 1.0.1 and combine python 2/3 packages.

2 files changed, 45 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 30de4642703d..20c2bde03e85 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,26 @@
+# Generated by mksrcinfo v8
+# Sat Sep 30 19:38:20 UTC 2017
 pkgbase = python-nss
-	pkgdesc = Python 3 bindings for NSS and NSPR
-	pkgver = 1.0.0
+	pkgdesc = Python bindings for NSS and NSPR
+	pkgver = 1.0.1
 	pkgrel = 1
-	url = ftp://ftp.mozilla.org/pub/mozilla.org/security/python-nss
+	url = https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Python_binding_for_NSS
 	arch = i686
 	arch = x86_64
 	license = MPL
 	license = GPL
 	license = LGPL
 	makedepends = python-setuptools
-	depends = python
-	depends = nspr
+	makedepends = python2-setuptools
 	depends = nss
-	options = !emptydirs
-	source = https://ftp.mozilla.org/pub/security/python-nss/releases/PYNSS_RELEASE_1_0_0/src/python-nss-1.0.0.tar.bz2
-	sha512sums = cf0ab25be1f31eca1e48253de43d8740556c9cb060ad13e6ab59bb277c8bb53d4e2d2d354ca23bcf178c5a522d01f5c1e00c4f473a2e3f8e9ab9eb5ec1677f99
+	source = https://ftp.mozilla.org/pub/security/python-nss/releases/PYNSS_RELEASE_1_0_1/src/python-nss-1.0.1.tar.bz2
+	sha512sums = 88fc5a066a54524f0dd73cba8947bb3cd4cc078cf59a72253f0e56d835f39679a10a4ee87b5d9f4c167d0ff7a40704dee2e4d890e1d304afbe346ba02b8750b9
 
 pkgname = python-nss
+	depends = nss
+	depends = python
+
+pkgname = python2-nss
+	depends = nss
+	depends = python2
 
diff --git a/PKGBUILD b/PKGBUILD
index 6d18463ca4ca..f95d05f0395f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,44 @@
-# Maintainer: Jan Cholasta <grubber at grubber cz>
+# Maintainer: Ben Wolsieffer <benwolsieffer@gmail.com>
+# Contributor: Jan Cholasta <grubber at grubber cz>
 # Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 
-# The documentation fails to build right now
-
-pkgname=python-nss
-pkgver=1.0.0
+_py_pkgname=nss
+pkgbase=python-${_py_pkgname}
+pkgname=(python-${_py_pkgname} python2-${_py_pkgname})
+pkgver=1.0.1
 pkgrel=1
-pkgdesc="Python 3 bindings for NSS and NSPR"
+pkgdesc="Python bindings for NSS and NSPR"
 arch=(i686 x86_64)
-url="ftp://ftp.mozilla.org/pub/mozilla.org/security/python-nss"
+url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Python_binding_for_NSS"
 license=(MPL GPL LGPL)
-depends=(python nspr nss)
-#makedepends=(python-setuptools python-docutils epydoc)
-makedepends=(python-setuptools)
-options=(!emptydirs)
-# Official mirror isn't working. We'll use Fedora's mirror
+depends=(nss)
+makedepends=(python-setuptools python2-setuptools)
 source=("https://ftp.mozilla.org/pub/security/python-nss/releases/PYNSS_RELEASE_${pkgver//./_}/src/python-nss-${pkgver}.tar.bz2")
-sha512sums=('cf0ab25be1f31eca1e48253de43d8740556c9cb060ad13e6ab59bb277c8bb53d4e2d2d354ca23bcf178c5a522d01f5c1e00c4f473a2e3f8e9ab9eb5ec1677f99')
+sha512sums=('88fc5a066a54524f0dd73cba8947bb3cd4cc078cf59a72253f0e56d835f39679a10a4ee87b5d9f4c167d0ff7a40704dee2e4d890e1d304afbe346ba02b8750b9')
 
 build() {
-  cd "python-nss-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    python setup.py build
+    python2 setup.py build
+}
+
+# Automatically create package functions using Bash magic
+source /dev/stdin << EOF
+package_python-${_py_pkgname}() {
+    depends+=('python')
 
-  python3 setup.py build
-  #python3 setup.py build_doc
+    cd "\${srcdir}/${pkgname}-${pkgver}"
+
+    python setup.py install --skip-build --root="\${pkgdir}" --optimize=1
 }
 
-package() {
-  cd "python-nss-${pkgver}"
+package_python2-${_py_pkgname}() {
+    depends+=('python2')
+
+    cd "\${srcdir}/${pkgname}-${pkgver}"
 
-  python3 setup.py install --skip-build --root="${pkgdir}/" --optimize=1
-  #python3 setup.py install_doc --skip-build
+    python2 setup.py install --skip-build --root="\${pkgdir}" --optimize=1
 }
+EOF
+
+# vim:set ts=4 sw=4 et: