From 9db8b4926857aad2c1be7e689d1477f8a352c0ac Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Tue, 15 Feb 2022 15:25:56 -0500
Subject: libraries/openbabel: Fix download URL, remove jdk dep.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/openbabel/README               |  4 ++++
 libraries/openbabel/openbabel.SlackBuild | 14 ++++++++------
 libraries/openbabel/openbabel.info       |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'libraries/openbabel')

diff --git a/libraries/openbabel/README b/libraries/openbabel/README
index 65f976b968a0f..345d907fb4ff6 100644
--- a/libraries/openbabel/README
+++ b/libraries/openbabel/README
@@ -2,3 +2,7 @@ OpenBabel is a project designed to pick up where Babel left off, as
 a cross-platform program and library designed to interconvert between
 many file formats used in molecular modeling, computational chemistry,
 and many related areas.    
+
+Optional dependency: if you want the graphical interface (obgui),
+install wxPython or wxGTK3 (either will do) before running this
+script.
diff --git a/libraries/openbabel/openbabel.SlackBuild b/libraries/openbabel/openbabel.SlackBuild
index db323e65fcd80..68c4688d0e25e 100644
--- a/libraries/openbabel/openbabel.SlackBuild
+++ b/libraries/openbabel/openbabel.SlackBuild
@@ -24,6 +24,11 @@
 
 # Thanks to Daniil Bratashov (dn2010@gmail.com) for the cmake conversion
 
+# 20220215 bkw:
+# - fix download URL (github stupidity again).
+# - remove jdk from REQUIRES: it wasn't being used.
+# - add README note about wx(Python|GTK3) optional dep.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=openbabel
@@ -41,9 +46,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
@@ -73,14 +75,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+tar xvf $CWD/$PRGNAM-$PRGNAM-$SRCVER.tar.gz
 cd $PRGNAM-$PRGNAM-$SRCVER
 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 {} \+
 
 mkdir -p build
 cd build
diff --git a/libraries/openbabel/openbabel.info b/libraries/openbabel/openbabel.info
index 112968ba8a24f..fdb882ec2eefe 100644
--- a/libraries/openbabel/openbabel.info
+++ b/libraries/openbabel/openbabel.info
@@ -1,10 +1,10 @@
 PRGNAM="openbabel"
 VERSION="2.4.1"
 HOMEPAGE="http://openbabel.sourceforge.net"
-DOWNLOAD="https://github.com/openbabel/openbabel/archive/openbabel-2-4-1/openbabel-2-4-1.tar.gz"
+DOWNLOAD="https://github.com/openbabel/openbabel/archive/openbabel-2-4-1/openbabel-openbabel-2-4-1.tar.gz"
 MD5SUM="c0e0aefeef0f9f2bb2c78109d65c30a5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES=""
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"
-- 
cgit v1.2.3