[arch-commits] Commit in fabric/trunk (PKGBUILD paramiko.patch)

[Sven-Hendrik Haase]

    Date: Wednesday, March 26, 2014 @ 22:34:09
  Author: svenstaro
Revision: 108333

upgpkg: fabric 1.8.3-2

Fix paramiko compatibility

Added:
  fabric/trunk/paramiko.patch
Modified:
  fabric/trunk/PKGBUILD

----------------+
 PKGBUILD       |    9 ++++++---
 paramiko.patch |   24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-26 21:21:25 UTC (rev 108332)
+++ PKGBUILD	2014-03-26 21:34:09 UTC (rev 108333)
@@ -3,17 +3,20 @@
 
 pkgname=fabric
 pkgver=1.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Python library and command-line tool designed to streamline deploying applications or performing system administration tasks via the SSH protocol"
 url="http://fabfile.org/"
 license=('BSD')
 arch=('any')
 depends=('python2' 'pycrypto' 'python2-paramiko' 'python2-setuptools')
-source=("http://pypi.python.org/packages/source/F/Fabric/Fabric-${pkgver}.tar.gz")
-md5sums=('02ce0ad4657f2d0ab6497a8fd3a09c2c')
+source=("http://pypi.python.org/packages/source/F/Fabric/Fabric-${pkgver}.tar.gz"
+        paramiko.patch)
+md5sums=('02ce0ad4657f2d0ab6497a8fd3a09c2c'
+         '5bec4030b1e99ace47f2e1eaf6f7b190')
 
 package() {
   cd ${srcdir}/Fabric-${pkgver}
+  patch -Np0 < ${srcdir}/paramiko.patch
   python2 setup.py install --root=${pkgdir} --optimize=1
 
   install -D -m644 README.rst ${pkgdir}/usr/share/doc/${pkgname}/README.rst

Added: paramiko.patch
===================================================================
--- paramiko.patch	                        (rev 0)
+++ paramiko.patch	2014-03-26 21:34:09 UTC (rev 108333)
@@ -0,0 +1,24 @@
+--- setup.py
++++ setup.py
+@@ -26,6 +26,11 @@ pip, with `pip install fabric==dev`.
+ For more information, please see the Fabric website or execute ``fab --help``.
+ """ % (get_version('branch'), readme)
+
++if sys.version_info[:2] < (2, 6):
++    install_requires=['paramiko>=1.10,<1.13']
++else:
++    install_requires=['paramiko>=1.10']
++
+ setup(
+     name='Fabric',
+     version=get_version('short'),
+@@ -37,7 +42,7 @@ setup(
+     packages=find_packages(),
+     test_suite='nose.collector',
+     tests_require=['nose', 'fudge<1.0'],
+-    install_requires=['paramiko>=1.10,<1.13'],
++    install_requires=install_requires,
+     entry_points={
+         'console_scripts': [
+             'fab = fabric.main:main',
+