From 29573f5c95fa70f5c1e97868dfc4904972ddaa70 Mon Sep 17 00:00:00 2001
From: Alan Alberghini <414N@slacky.it>
Date: Wed, 3 Jan 2018 23:45:57 +0000
Subject: office/sofastats: Updated for version 1.4.6.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 office/sofastats/README               |  4 ++++
 office/sofastats/doinst.sh            |  4 ++++
 office/sofastats/sofastats.SlackBuild | 12 +++++-------
 office/sofastats/sofastats.desktop    |  8 ++++++++
 office/sofastats/sofastats.info       |  8 ++++----
 5 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 office/sofastats/doinst.sh
 create mode 100644 office/sofastats/sofastats.desktop

diff --git a/office/sofastats/README b/office/sofastats/README
index 05d7e74dbf..64b59f2f6c 100644
--- a/office/sofastats/README
+++ b/office/sofastats/README
@@ -3,3 +3,7 @@ with an emphasis on ease of use, learn as you go, and beautiful output.
 
 SOFA lets you display results in an attractive format ready to share. And SOFA
 will help you learn as you go.
+
+Optional packages to install can be:
+ - psycopg2, to support reading data from PostgreSQL databases
+ - MySQL-python, to support reading data from MySQL databases
diff --git a/office/sofastats/doinst.sh b/office/sofastats/doinst.sh
new file mode 100644
index 0000000000..4e8ba7071d
--- /dev/null
+++ b/office/sofastats/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/office/sofastats/sofastats.SlackBuild b/office/sofastats/sofastats.SlackBuild
index cc198a923f..5da8062475 100644
--- a/office/sofastats/sofastats.SlackBuild
+++ b/office/sofastats/sofastats.SlackBuild
@@ -23,14 +23,9 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 # -----------------------------------------------------------------------------
-#
-# Build history:
-#
-# 1 - Initial release.
-# 2 - Updated for version 1.4.3
 
 PRGNAM=sofastats
-VERSION=${VERSION:-1.4.3}
+VERSION=${VERSION:-1.4.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,17 +52,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/share/$PRGNAM $PKG/usr/bin
+mkdir -p $PKG/usr/share/$PRGNAM $PKG/usr/bin $PKG/usr/share/applications
 
 cp -r sofa_main/* $PKG/usr/share/$PRGNAM
 ln -sf /usr/share/$PRGNAM/start.py $PKG/usr/bin/$PRGNAM
 
+install -m0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $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
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/sofastats/sofastats.desktop b/office/sofastats/sofastats.desktop
new file mode 100644
index 0000000000..b9f1d56bc2
--- /dev/null
+++ b/office/sofastats/sofastats.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec=python /usr/share/sofastats/start.py
+GenericName=Analysis package
+Icon=/usr/share/sofastats/images/sofastats_48.xpm
+Name=SOFA Statistics
+StartupNotify=true
+Terminal=false
+Type=Application
diff --git a/office/sofastats/sofastats.info b/office/sofastats/sofastats.info
index 5ad7502cef..4666d48b3b 100644
--- a/office/sofastats/sofastats.info
+++ b/office/sofastats/sofastats.info
@@ -1,10 +1,10 @@
 PRGNAM="sofastats"
-VERSION="1.4.3"
+VERSION="1.4.6"
 HOMEPAGE="http://www.sofastatistics.com"
-DOWNLOAD="https://sourceforge.net/projects/sofastatistics/files/sofastatistics/1.4.3/sofastats-1.4.3.tar.gz"
-MD5SUM="74e8b118152dec77bdc3ff327aa9e158"
+DOWNLOAD="http://sourceforge.net/projects/sofastatistics/files/sofastatistics/1.4.6/sofastats-1.4.6.tar.gz"
+MD5SUM="c39880daebead5247b78b6550cb4e2c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="matplotlib pywebkitgtk"
+REQUIRES="matplotlib pywebkitgtk wkhtmltopdf python-requests pyPdf"
 MAINTAINER="Alan Alberghini"
 EMAIL="414N@slacky.it"
-- 
cgit v1.2.3