3 files changed, 23 insertions, 23 deletions
diff --git a/python/feedparser/feedparser.SlackBuild b/python/feedparser/feedparser.SlackBuild
index 4eeb9f8bb1..2f43888dd4 100644
--- a/python/feedparser/feedparser.SlackBuild
+++ b/python/feedparser/feedparser.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for feedparser
 # Modified by Luis Henrique <lmello.009@gmail.com>
-# Maintained 2014 by Christoph Willing <chris.willing@iinet.net.au>
+# Maintained 2014-2016 by Christoph Willing <chris.willing@linux.com>
 
 # Copyright 2008-2009 Chess Griffin <chess@chessgriffin.com>
 # All rights reserved.
@@ -25,8 +25,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=feedparser
-VERSION=5.1.3
-BUILD=${BUILD:-2}
+VERSION=5.2.1
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -42,10 +42,10 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="LICENSE README"
+DOCS="LICENSE NEWS README.rst"
 
-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"
@@ -58,28 +58,29 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xf $CWD/$VERSION.tar.gz || tar xf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-python setup.py build || exit 1
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root $PKG || exit 1
+python setup.py build
+python setup.py install --root $PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS docs/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/feedparser/feedparser.info b/python/feedparser/feedparser.info
index ae07bee853..7ba4b29c89 100644
--- a/python/feedparser/feedparser.info
+++ b/python/feedparser/feedparser.info
@@ -1,10 +1,10 @@
 PRGNAM="feedparser"
-VERSION="5.1.3"
-HOMEPAGE="http://code.google.com/p/feedparser/"
-DOWNLOAD="http://feedparser.googlecode.com/files/feedparser-5.1.3.tar.gz"
-MD5SUM="f2253de78085a1d5738f626fcc1d8f71"
+VERSION="5.2.1"
+HOMEPAGE="https://github.com/kurtmckee/feedparser"
+DOWNLOAD="https://github.com/kurtmckee/feedparser/archive/5.2.1.tar.gz"
+MD5SUM="885d800496ffd538920960b9dbc45faf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Christoph Willing"
-EMAIL="chris.willing@iinet.net.au"
+EMAIL="chris.willing@linux.com"
diff --git a/python/feedparser/slack-desc b/python/feedparser/slack-desc
index a10fd0f12d..415f65e7f2 100644
--- a/python/feedparser/slack-desc
+++ b/python/feedparser/slack-desc
@@ -6,15 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-feedparser: feedparser (parse RSS feeds in Python)
+feedparser: feedparser (Python RSS feed parser)
 feedparser:
 feedparser: feedparser is a Python utility to parse RSS and Atom feeds
 feedparser:
 feedparser:
-feedparser: Homepage:  http://code.google.com/p/feedparser/
+feedparser: Homepage:  https://github.com/kurtmckee/feedparser
 feedparser:
 feedparser:
 feedparser:
 feedparser:
 feedparser:
-