aboutsummaryrefslogtreecommitdiff
path: root/office
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2021-09-29 17:33:11 -0400
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2021-10-13 00:52:30 +0700
commitde076e10fa206e04e85ffc0d1277319092fecd1c (patch)
tree28d95366c98508d23d3a2578ddc43c93ee415f3e /office
parent2aa433b8110bfa629f6fb96b529472ef994f9c1b (diff)
office/x_x: Fix -current build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'office')
-rw-r--r--office/x_x/x_x.SlackBuild14
1 files changed, 3 insertions, 11 deletions
diff --git a/office/x_x/x_x.SlackBuild b/office/x_x/x_x.SlackBuild
index c39f33065614e..c26cfde6bcd51 100644
--- a/office/x_x/x_x.SlackBuild
+++ b/office/x_x/x_x.SlackBuild
@@ -6,6 +6,8 @@
# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+# 20210929 bkw: force use of python 2. this doesn't run under 3.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=x_x
@@ -22,9 +24,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -60,14 +59,7 @@ chown -R root:root .
find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
\! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-# 20201115 bkw: at some point, Slackware's /usr/bin/python will be python3.
-# This stuff can go away then.
-case "${PYVER:-auto}" in
- 2|3) ;; # use as-is
- auto) PYVER=2; python3 -c 'import sys' 2>/dev/null && PYVER=3 ;;
-esac
-
-python$PYVER setup.py install --root=$PKG
+python2 setup.py install --root=$PKG
# man page manually converted from README.rst by SlackBuild author.
mkdir -p $PKG/usr/man/man1