libraries/libxls: Updated for version 1.5.2.

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

4 files changed, 22 insertions, 23 deletions

diff --git a/libraries/libxls/README b/libraries/libxls/README
index 62951292c8..aadb1475f7 100644
--- a/libraries/libxls/README
+++ b/libraries/libxls/README
@@ -1,9 +1,9 @@
-libxls - Extract Cell Data From Excel xls files
+libxls - Read XLS files from C
 
-This library can read Excel .xls files and allow you to access cell
-values and retrieve other information (like the worksheet properties).
+This is libxls, a C library for reading Excel files in the nasty old
+binary OLE format, plus a command-line tool for converting XLS to CSV
+(named, appropriately enough, xls2csv).
 
-There is a utility to convert an excel file to CSV format, or to
-formatted HTML (see the test directory).
-
-libxls2csv test.xls > test.csv
+Note: The command-line tool is, instead, named libxls2csv by this
+SlackBuild script to avoid conflict with xls2csv tool from catdoc
+package.
diff --git a/libraries/libxls/libxls.SlackBuild b/libraries/libxls/libxls.SlackBuild
index 75c11f949b..689407583d 100644
--- a/libraries/libxls/libxls.SlackBuild
+++ b/libraries/libxls/libxls.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libxls
 
-# Copyright 2018 Pedro R.M. Júnior, Campinas, SP, Brazil
+# Copyright 2018, 2019 Pedro R.M. Júnior, Campinas, SP, Brazil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libxls
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,8 +60,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-unzip $CWD/$PRGNAM-$VERSION.zip
-cd $PRGNAM
+tar -xzf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,7 +69,6 @@ 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 {} \;
 
-./bootstrap
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/libxls/libxls.info b/libraries/libxls/libxls.info
index 0683f6ea01..3653fd9fe1 100644
--- a/libraries/libxls/libxls.info
+++ b/libraries/libxls/libxls.info
@@ -1,8 +1,8 @@
 PRGNAM="libxls"
-VERSION="1.4.0"
-HOMEPAGE="https://sourceforge.net/projects/libxls"
-DOWNLOAD="https://downloads.sourceforge.net/project/libxls/libxls-1.4.0.zip"
-MD5SUM="a4930f5743ce2e7b4f2a1cd898b9bdc6"
+VERSION="1.5.2"
+HOMEPAGE="https://github.com/libxls/libxls"
+DOWNLOAD="https://github.com/libxls/libxls/releases/download/v1.5.2/libxls-1.5.2.tar.gz"
+MD5SUM="31e0fde3b458e58db13f2f9b408c8df2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libxls/slack-desc b/libraries/libxls/slack-desc
index f71bf1d42a..9bdf36d28b 100644
--- a/libraries/libxls/slack-desc
+++ b/libraries/libxls/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-libxls: libxls (Extract Cell Data From Excel xls files)
+libxls: libxls (Read XLS files from C)
 libxls:
-libxls: This library can read Excel .xls files and allow you to access cell
-libxls: values and retrieve other information (like the worksheet properties).
+libxls: This is libxls, a C library for reading Excel files in the nasty old
+libxls: binary OLE format, plus a command-line tool for converting XLS to CSV
+libxls: (named, appropriately enough, libxls2csv).
 libxls:
-libxls: There is a utility to convert an excel file to CSV format, or to
-libxls: formatted HTML (see the test directory).
-libxls:
-libxls: libxls2csv test.xls > test.csv
+libxls: Note: The command-line tool is, instead, named libxls2csv by this
+libxls: SlackBuild script to avoid conflict with xls2csv tool from catdoc
+libxls: package.
 libxls:
 libxls: