system/oracle-instantclient-devel: ARCH=noarch, SDL READMDE/LICENSE

Signed-off-by: bedlam <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 15 insertions, 34 deletions

diff --git a/system/oracle-instantclient-devel/README b/system/oracle-instantclient-devel/README
index b05c7fec2e..17bc7f0d11 100644
--- a/system/oracle-instantclient-devel/README
+++ b/system/oracle-instantclient-devel/README
@@ -6,12 +6,3 @@ applications against instantclient.
 
 Oracle-xe and JRE or JDK packages are optional and
 depends on your needs.
-
-You need an Oracle account and you must Agree to Oracle's
-download agreement before this can be downloaded.
-You have to use a web browser to download it.
-
-Ensure that you download the correct RPM
-"Instant Client Package - SDK"
-For x86: oracle-instantclient12.1-devel-12.1.0.2.0-1.i386.rpm
-For x86_64: oracle-instantclient12.1-devel-12.1.0.2.0-1.x86_64.rpm
diff --git a/system/oracle-instantclient-devel/oracle-instantclient-devel.SlackBuild b/system/oracle-instantclient-devel/oracle-instantclient-devel.SlackBuild
index 8ab3ce26c0..ed33477708 100644
--- a/system/oracle-instantclient-devel/oracle-instantclient-devel.SlackBuild
+++ b/system/oracle-instantclient-devel/oracle-instantclient-devel.SlackBuild
@@ -27,18 +27,13 @@ cd $(dirname $0) ; CWD=$(pwd)
 PRGNAM=oracle-instantclient-devel
 VERSION=${VERSION:-21.5.0.0.0}
 RELEASE=${RELEASE:-1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 ORAVER="21"
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-      i?86) ARCH=i386 ;;
-    x86_64) ARCH=x86_64 ;;
-         *) echo "Architecture not supported"; exit 0;
-  esac
-fi
+# 2023-05-16 DW: this doesn't contain any binaries
+ARCH="noarch"
+SRCARCH="x86_64"
 
 # 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
@@ -52,15 +47,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-else
-  LIBDIRSUFFIX=""
-fi
-
 # recreating the name of the RPM
-RPMNAM="$PRGNAM-$VERSION-$RELEASE.$ARCH.rpm"
+RPMNAM="$PRGNAM-$VERSION-$RELEASE.$SRCARCH.rpm"
 
 set -e
 
@@ -75,17 +63,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-if [ "$LIBDIRSUFFIX" = "64" ]; then
-    mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
-fi
-
-ORACLE_CLIENT_HOME="/usr/lib${LIBDIRSUFFIX}/oracle/${ORAVER}/\
-client${LIBDIRSUFFIX}"
-ORACLE_CLIENT_INCLUDE="/usr/include/oracle/${ORAVER}/client${LIBDIRSUFFIX}"
+# 2023-05-16 DW: keep this because it matches the -basic package
+mv $PKG/usr/lib $PKG/usr/lib64
 
+ORACLE_CLIENT_HOME="/usr/lib64/oracle/${ORAVER}/client64"
+ORACLE_CLIENT_INCLUDE="/usr/include/oracle/${ORAVER}/client64"
 
 # Testing if ORACLE already installed
-if [ -z "${ORACLE_HOME}" ]; then
+if [ -z "$ORACLE_HOME" ]; then
     ORACLE_HOME=$ORACLE_CLIENT_HOME
 fi
 
@@ -94,6 +79,11 @@ mkdir -p $PKG/$ORACLE_HOME
 ln -sf $ORACLE_CLIENT_INCLUDE $PKG/$ORACLE_HOME/include
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# 2023-05-16 DW: may as well add these here
+cat $PKG/usr/share/oracle/21/client64/doc/SDK_README \
+  > $PKG/usr/doc/$PRGNAM-$VERSION/SDK_README
+cat $PKG/usr/share/oracle/21/client64/doc/SDK_LICENSE \
+  > $PKG/usr/doc/$PRGNAM-$VERSION/SDK_LICENSE
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install