Date: Saturday, April 7, 2018 @ 13:47:22 Author: foxboron Revision: 314836
Removed patch Added: python-m2crypto/ Modified: python-m2crypto/trunk/PKGBUILD Deleted: python-m2crypto/trunk/openssl-1.1.0-force.patch python2-m2crypto/ ---------------------------+ PKGBUILD | 44 ++++++++++++++++++++++++++++++++------------ openssl-1.1.0-force.patch | 33 --------------------------------- 2 files changed, 32 insertions(+), 45 deletions(-) Modified: python-m2crypto/trunk/PKGBUILD =================================================================== --- python2-m2crypto/trunk/PKGBUILD 2018-04-07 13:46:40 UTC (rev 314835) +++ python-m2crypto/trunk/PKGBUILD 2018-04-07 13:47:22 UTC (rev 314836) @@ -1,29 +1,49 @@ # $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ -# Maintainer: Angel Velasquez <an...@archlinux.org> +# Maintainer: Morten Linderud <foxbo...@archlinux.org> +# Contributor: Angel Velasquez <an...@archlinux.org> # Contributor: Sergej Pupykin <ser...@aur.archlinux.org> # Contributor: William Rea <sillywi...@gmail.com> -pkgname=python2-m2crypto -pkgver=0.27.0 +pkgbase=python-m2crypto +pkgname=(python2-m2crypto python-m2crypto) +pkgver=0.29.0 pkgrel=1 pkgdesc="A crypto and SSL toolkit for Python" arch=('x86_64') url="https://pypi.python.org/pypi/M2Crypto" license=('BSD') -depends=('python2' 'openssl' 'python2-typing') -makedepends=('swig' 'python2-setuptools') -source=("https://pypi.python.org/packages/01/bd/a41491718f9e2bebab015c42b5be7071c6695acfa301e3fc0480bfd6a15b/M2Crypto-$pkgver.tar.gz" +makedepends=('python' 'python-setuptools' + 'python2' 'python2-setuptools' + 'swig') +source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/m2crypto/m2crypto/repository/${pkgver}/archive.tar.gz" "LICENSE") -sha256sums=('82317459d653322d6b37f122ce916dc91ddcd9d1b814847497ac796c4549dd68' +sha256sums=('3884d98802014679d0fc38c2de6549d0259d5a89855a93d5eb264edabe67d536' '4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0') -build() { - cd "${srcdir}/M2Crypto-${pkgver}" +prepare() { + mv m2crypto-${pkgver}-* m2crypto-${pkgver} + cp -a m2crypto-$pkgver{,-py2} +} + +build(){ + cd "$srcdir/m2crypto-$pkgver-py2" python2 setup.py build + + cd "$srcdir/m2crypto-$pkgver" + python setup.py build + } -package() { - cd "${srcdir}/M2Crypto-${pkgver}" - python2 setup.py install --root="${pkgdir}/" --optimize=1 +package_python2-m2crypto() { + depends=('python2' 'openssl' 'python2-typing') + cd "${srcdir}/m2crypto-${pkgver}-py2" + python2 setup.py install --root="${pkgdir}/" --optimize=1 --skip-build install -D -m644 "$srcdir"/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } + +package_python-m2crypto() { + depends=('python' 'openssl') + cd "${srcdir}/m2crypto-${pkgver}" + python setup.py install --root="${pkgdir}/" --optimize=1 --skip-build + install -D -m644 "$srcdir"/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Deleted: python-m2crypto/trunk/openssl-1.1.0-force.patch =================================================================== --- python2-m2crypto/trunk/openssl-1.1.0-force.patch 2018-04-07 13:46:40 UTC (rev 314835) +++ python-m2crypto/trunk/openssl-1.1.0-force.patch 2018-04-07 13:47:22 UTC (rev 314836) @@ -1,33 +0,0 @@ ---- M2Crypto-0.25.1/setup.py 2016-07-22 14:43:17.000000000 +0200 -+++ M2Crypto-0.25.1.dirty/setup.py 2017-03-23 18:18:35.128517781 +0100 -@@ -70,8 +70,8 @@ - self.libraries = ['ssleay32', 'libeay32'] - self.openssl = 'c:\\pkg' - else: -- self.libraries = ['ssl', 'crypto'] -- self.openssl = '/usr' -+ self.libraries = [':libssl.so.1.0.0', ':libcrypto.so.1.0.0'] -+ self.openssl = '/usr/lib/openssl-1.0/' - - def finalize_options(self): - '''Overloaded build_ext implementation to append custom openssl -@@ -87,16 +87,11 @@ - if _openssl and os.path.isdir(_openssl): - self.openssl = _openssl - -- self.include_dirs.append(os.path.join(self.openssl, 'include')) -- openssl_library_dir = os.path.join(self.openssl, 'lib') -+ self.include_dirs.append(os.path.join('/usr/include/', 'openssl-1.0')) -+ -+ openssl_library_dir = os.path.join('/usr/lib/', 'openssl-1.0') - - if platform.system() == "Linux": -- if _multiarch: # on Fedora/RHEL it is an empty string -- self.include_dirs.append( -- os.path.join(self.openssl, 'include', _multiarch)) -- else: -- self.include_dirs.append( -- os.path.join(self.openssl, 'include', 'openssl')) - - # For RedHat-based distros, the '-D__{arch}__' option for - # Swig needs to be normalized, particularly on i386.