From 4be37caca7abec7c72ba9c4b4d2b1b3d2747a0d5 Mon Sep 17 00:00:00 2001 From: B. Watson Date: Wed, 9 Mar 2022 15:13:18 -0500 Subject: python/python3-booleanOperations: Add missing dep, fix script. Signed-off-by: B. Watson --- .../python3-booleanOperations.SlackBuild | 37 ++++++++++++---------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/python/python3-booleanOperations/python3-booleanOperations.SlackBuild b/python/python3-booleanOperations/python3-booleanOperations.SlackBuild index 667f13297d..fc55341670 100644 --- a/python/python3-booleanOperations/python3-booleanOperations.SlackBuild +++ b/python/python3-booleanOperations/python3-booleanOperations.SlackBuild @@ -22,10 +22,18 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220301 bkw: Modified by SlackBuilds.org: +# - add missing 'wheel' dep (to prevent setup.py from trying to +# download it). +# - remove PKGNAM stuff. please don't ever do that, it makes the script +# hard to read. also $PRGNAM *must* match the directory and SlackBuild +# name. if the source tarball filename and/or directory don't match +# $PRGNAM, use $SRCNAM instead. + cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=booleanOperations -PKGNAM=python3-booleanOperations +PRGNAM=python3-booleanOperations +SRCNAM=booleanOperations VERSION=${VERSION:-0.9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -39,16 +47,13 @@ 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 "$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 fi TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PKGNAM +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} set -e @@ -56,24 +61,24 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -unzip $CWD/$PRGNAM-$VERSION.zip -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +unzip $CWD/$SRCNAM-$VERSION.zip +cd $SRCNAM-$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 \ + -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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ python3 setup.py install --root=$PKG -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a README.rst LICENSE $PKG/usr/doc/$PKGNAM-$VERSION -cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README.rst LICENSE $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 cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE -- cgit v1.2.3