3 files changed, 28 insertions, 12 deletions
diff --git a/development/ipython/README b/development/ipython/README
index 0739d909e53f..8cd63f0ddc53 100644
--- a/development/ipython/README
+++ b/development/ipython/README
@@ -1,9 +1,13 @@
-IPython is a replacement shell for Python programming. It offers:
+IPython is a replacement shell for Python programming. It offers an enhanced
+Python shell for the terminal.
 
-* An enhanced Python shell for the terminal
-* A Qt-based console
-* A web-based notebook for coding
-* An architecture for interactive parallel computing 
+The following additional features may be enabled by installing the listed
+optional dependencies:
 
-matplotlib, pyzmq and tornado are all strongly-recommended dependencies.
-Without these, only IPython's default console will run.
+* parallel computing: pyzmq
+* Qt console: Pygments, pyzmq
+* nbconvert: pandoc, Pygments, Sphinx
+* notebook: Jinja2, pyzmq, tornado
+* plotting: matplotlib
+* LaTeX in notebooks: ipython-mathjax
+* documentation: matplotlib, Pygments, Sphinx (also set DOCS=yes)
diff --git a/development/ipython/ipython.SlackBuild b/development/ipython/ipython.SlackBuild
index 8be93914eaea..8f82a702f652 100644
--- a/development/ipython/ipython.SlackBuild
+++ b/development/ipython/ipython.SlackBuild
@@ -25,7 +25,7 @@
 # Maintained by Benjamin-Trigona-Harany
 
 PRGNAM=ipython
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-1.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,6 +41,7 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
+DOCS=${DOCS:-no}
 
 set -e
 
@@ -60,7 +61,7 @@ find -L . \
 python setup.py install --root="$PKG"
 
 mkdir -p $PKG/usr/doc
-mv $PKG/usr/share/doc/ipython $PKG/usr/doc/ipython-$VERSION
+mv $PKG/usr/share/doc/ipython $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \;
 
 mv $PKG/usr/share/man $PKG/usr
@@ -70,6 +71,17 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 # Delete now empty directory
 rm -rf $PKG/usr/share
 
+# Build and install optional html docs
+if [ "$DOCS" = "yes" ] ; then
+  cd docs
+    make html
+    cp -r build/html $PKG/usr/doc/$PRGNAM-$VERSION
+  cd ..
+fi
+
+cp COPYING.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/development/ipython/ipython.info b/development/ipython/ipython.info
index 45284e291c34..69d60a0597d0 100644
--- a/development/ipython/ipython.info
+++ b/development/ipython/ipython.info
@@ -1,8 +1,8 @@
 PRGNAM="ipython"
-VERSION="1.1.0"
+VERSION="1.2.1"
 HOMEPAGE="http://ipython.org"
-DOWNLOAD="http://archive.ipython.org/release/1.1.0/ipython-1.1.0.tar.gz"
-MD5SUM="70d69c78122923879232567ac3c47cef"
+DOWNLOAD="http://archive.ipython.org/release/1.2.1/ipython-1.2.1.tar.gz"
+MD5SUM="4ffb36697f7ca8cb4a2de0f5b30bc89c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""