python/python-netaddr: Updated for version 0.7.18

Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>

3 files changed, 11 insertions, 23 deletions

diff --git a/python/python-netaddr/01_use_setuptools.diff b/python/python-netaddr/01_use_setuptools.diff
deleted file mode 100644
index 7dd3d6e838..0000000000
--- a/python/python-netaddr/01_use_setuptools.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2012-08-30 08:49:42.000000000 +1000
-+++ setup.py	2013-03-07 20:03:40.356427113 +1000
-@@ -8,7 +8,7 @@
- import os
- import sys
- 
--from distutils.core import setup
-+from setuptools import setup
- 
- if os.path.exists('MANIFEST'):
-     os.remove('MANIFEST')
diff --git a/python/python-netaddr/python-netaddr.SlackBuild b/python/python-netaddr/python-netaddr.SlackBuild
index 160e798d2b..deaff20ec7 100644
--- a/python/python-netaddr/python-netaddr.SlackBuild
+++ b/python/python-netaddr/python-netaddr.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python-netaddr
 
-# Copyright 2013-2014 Christoph Willing, Australia
+# Copyright 2013-2016 Christoph Willing,  Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,13 +24,13 @@
 
 PRGNAM=python-netaddr
 SRC_PRGNAM=netaddr
-VERSION=${VERSION:-0.7.11}
+VERSION=${VERSION:-0.7.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -63,7 +63,6 @@ cd $TMP
 rm -rf $SRC_PRGNAM-$VERSION
 tar xvf $CWD/$SRC_PRGNAM-$VERSION.tar.gz
 cd $SRC_PRGNAM-$VERSION
-patch -p0 < $CWD/01_use_setuptools.diff
 
 if [ ${NEWDATA:-no} = "yes" ]; then
   echo 'downloading latest IEEE data'
@@ -84,7 +83,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+python setup_egg.py install --root=$PKG
 PYTHONPATH="build/lib" sphinx-build -b html docs/source docs/html
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -92,7 +91,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a docs/html \
-  AUTHORS CHANGELOG COPYRIGHT INSTALL LICENSE README REFERENCES THANKS \
+  AUTHORS CHANGELOG COPYRIGHT INSTALL LICENSE README* REFERENCES THANKS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/python/python-netaddr/python-netaddr.info b/python/python-netaddr/python-netaddr.info
index c12cedc18f..0e0ec00233 100644
--- a/python/python-netaddr/python-netaddr.info
+++ b/python/python-netaddr/python-netaddr.info
@@ -1,10 +1,10 @@
 PRGNAM="python-netaddr"
-VERSION="0.7.11"
+VERSION="0.7.18"
 HOMEPAGE="https://pypi.python.org/pypi/netaddr"
-DOWNLOAD="https://pypi.python.org/packages/source/n/netaddr/netaddr-0.7.11.tar.gz"
-MD5SUM="bca88a2395a99061e50d9ee19bc19051"
+DOWNLOAD="https://pypi.python.org/packages/source/n/netaddr/netaddr-0.7.18.tar.gz"
+MD5SUM="c65bb34f8bedfbbca0b316c490cd13a0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Sphinx Pygments MarkupSafe"
 MAINTAINER="Christoph Willing"
-EMAIL="chris.willing@iinet.net.au"
+EMAIL="chris.willing@linux.com"