1 files changed, 15 insertions, 14 deletions
diff --git a/python/python3/python3.SlackBuild b/python/python3/python3.SlackBuild
index 253bef21aa..b6dbd02e53 100644
--- a/python/python3/python3.SlackBuild
+++ b/python/python3/python3.SlackBuild
@@ -5,7 +5,7 @@
 # Based on Patrick Volkerding's official build script for python
 
 PRGNAM=python3
-VERSION=${VERSION:-3.1.3}
+VERSION=${VERSION:-3.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -37,15 +37,15 @@ fi
 set -eu
 
 # Location for Python site-packages:
-SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/python3.1/site-packages
+SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/python3.2/site-packages
 # same as above without $PKG
-TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/python3.1/site-packages
+TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/python3.2/site-packages
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf Python-$VERSION
-tar xvf $CWD/Python-$VERSION.tar.bz2
+tar xvf $CWD/Python-$VERSION.tar.xz
 cd Python-$VERSION
 
 patch -p1 < $CWD/patches/python3.readline.set_pre_input_hook.diff
@@ -53,8 +53,6 @@ patch -p1 < $CWD/patches/python3.readline.set_pre_input_hook.diff
 if [ "$ARCH" = "x86_64" ]; then
   # Install to lib64 instead of lib:
   patch -p1 < $CWD/patches/python3.x86_64.diff
-  # Python must report /usr/lib64/python3.1/site-packages as python_lib_dir:
-  patch -p1 < $CWD/patches/python3.pure64.diff
 fi
 
 chown -R root:root .
@@ -65,7 +63,6 @@ chmod -R u+w,go+r-w,a-s+X .
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-ncurses \
   --with-threads \
   --enable-ipv6 \
   --enable-shared \
@@ -75,21 +72,25 @@ chmod -R u+w,go+r-w,a-s+X .
 make
 make altinstall DESTDIR=$PKG
 
-# Create a symlink for convenience.
-( cd $PKG/usr/bin ; ln -sf python3.1 python3 )
+# Create a few useful symlinks.
+( cd $PKG/usr/bin
+  ln -sf python3.2 python3
+  ln -sf python3.2*-config python3.2-config
+  ln -sf pydoc3.2 pydoc3
+)
 
 # We'll install the python-tools under site-packages:
 mkdir -p $SITEPK
 cp -a Tools/* $SITEPK
 
-# Python 2.6 already has this script.
-rm -f $PKG/usr/bin/2to3
-
-# Install docs and demos:
+# Install docs:
 mkdir -p $PKG/usr/doc/python3-$VERSION
-cp -a README LICENSE Demo Doc Misc $PKG/usr/doc/python3-$VERSION
+cp -a README LICENSE Misc $PKG/usr/doc/python3-$VERSION
 mv $SITEPK/README $PKG/usr/doc/python3-$VERSION/README.python-tools
 ( cd $PKG/usr/doc/python3-$VERSION ; ln -sf $TOOLSDIR Tools )
+tar xf $CWD/python-$VERSION-docs-html.tar.bz2
+mv python-$VERSION-docs-html $PKG/usr/doc/python3-$VERSION/html
+chown -R root:root $PKG/usr/doc/python3-$VERSION
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true