4 files changed, 29 insertions, 17 deletions
diff --git a/libraries/python-musicbrainz2/README b/libraries/python-musicbrainz2/README
index cb21b0a6db39..530329b97203 100644
--- a/libraries/python-musicbrainz2/README
+++ b/libraries/python-musicbrainz2/README
@@ -1,7 +1,10 @@
-Python bindings for the MusicBrainz XML Web Service.
+Python Bindings for the MusicBrainz XML Web Service.
 
 This python package contains various modules for accessing the MusicBrainz
 web service, as well as parsing the MusicBrainz Metadata XML (MMD), or
 calculating DiscIDs from Audio CDs.
 
-Requires libdiscid available at SlackBuilds.org.
-\ No newline at end of file
+Python-musicbrainz2 requires libdiscid.
+
+If you'd like to generate and install the python-musicbrainz2 API documents,
+then install epydoc and pass "MAKE_DOCS=yes" to the SlackBuild script.
diff --git a/libraries/python-musicbrainz2/python-musicbrainz2.SlackBuild b/libraries/python-musicbrainz2/python-musicbrainz2.SlackBuild
index 2db1511a745f..168da4ee4816 100644
--- a/libraries/python-musicbrainz2/python-musicbrainz2.SlackBuild
+++ b/libraries/python-musicbrainz2/python-musicbrainz2.SlackBuild
@@ -5,8 +5,8 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=python-musicbrainz2
-VERSION=${VERSION:-0.6.0}
-ARCH=${ARCH:-noarch}
+VERSION=${VERSION:-0.7.0}
+ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -22,6 +22,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+chmod 0755 $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -30,6 +31,11 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Optional API documentation generation.
+if [ "${MAKE_DOCS:-no}" == "yes" ]; then
+  python setup.py docs
+fi
+
 python setup.py install --root=$PKG
 
 ( cd $PKG
@@ -42,9 +48,10 @@ python setup.py install --root=$PKG
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+[ -d html ] && cp -a html $PKG/usr/doc/$PRGNAM-$VERSION/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/python-musicbrainz2/python-musicbrainz2.info b/libraries/python-musicbrainz2/python-musicbrainz2.info
index aef8fb65c032..e5fcba2793c5 100644
--- a/libraries/python-musicbrainz2/python-musicbrainz2.info
+++ b/libraries/python-musicbrainz2/python-musicbrainz2.info
@@ -1,8 +1,10 @@
 PRGNAM="python-musicbrainz2"
-VERSION="0.6.0"
+VERSION="0.7.0"
 HOMEPAGE="http://musicbrainz.org/doc/PythonMusicBrainz2"
-DOWNLOAD="http://ftp.musicbrainz.org/pub/musicbrainz/python-musicbrainz2/python-musicbrainz2-0.6.0.tar.gz"
-MD5SUM="2ab23c3c15885d29ebd01bcc44ccc823"
+DOWNLOAD="http://ftp.musicbrainz.org/pub/musicbrainz/python-musicbrainz2/python-musicbrainz2-0.7.0.tar.gz"
+MD5SUM="7aa39add30fcd7e1724d4b29ba1f050e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/libraries/python-musicbrainz2/slack-desc b/libraries/python-musicbrainz2/slack-desc
index 8ea4c615a2a2..b79ab6980243 100644
--- a/libraries/python-musicbrainz2/slack-desc
+++ b/libraries/python-musicbrainz2/slack-desc
@@ -7,13 +7,13 @@
 
                    |-----handy-ruler------------------------------------------------------|
 python-musicbrainz2: Python-Musicbrainz2
-python-musicbrainz2: 
+python-musicbrainz2:
 python-musicbrainz2: Python Bindings for the MusicBrainz XML Web Service.
-python-musicbrainz2: 
+python-musicbrainz2:
 python-musicbrainz2: Homepage: http://musicbrainz.org/doc/PythonMusicBrainz2
-python-musicbrainz2: 
-python-musicbrainz2: 
-python-musicbrainz2: 
-python-musicbrainz2: 
-python-musicbrainz2: 
-python-musicbrainz2: 
+python-musicbrainz2:
+python-musicbrainz2:
+python-musicbrainz2:
+python-musicbrainz2:
+python-musicbrainz2:
+python-musicbrainz2: