academic/gelemental: Miscellaneous cleanup ; change download link

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 42 insertions, 29 deletions

diff --git a/academic/gelemental/README b/academic/gelemental/README
index b48548bcd907..490c49c2d80e 100644
--- a/academic/gelemental/README
+++ b/academic/gelemental/README
@@ -1,7 +1,8 @@
-gElemental is a periodic table viewer that provides detailed info 
-on the chemical elements. It is a port of GPeriodic to C++ and gtkmm. 
-It offers an improved UI, an updated and corrected data set, a better 
-data format, a list view and easier coloration. 
+gElemental is a periodic table viewer that provides detailed info
+on the chemical elements. It is a port of GPeriodic to C++ and gtkmm.
+It offers an improved UI, an updated and corrected data set, a better
+data format, a list view and easier coloration. The Chemical data are
+largely derived from BODR (the Blue Obelisk Data Repository) and from
+the chemical data compilations on the English Wikipedia.
 
-This requires glibmm and gtkmm, both of which are available at 
-Slackbuilds.org.
\ No newline at end of file
+This requires glibmm and gtkmm.
diff --git a/academic/gelemental/gelemental.SlackBuild b/academic/gelemental/gelemental.SlackBuild
index 1d475d4ccdac..da065fbbff6d 100644
--- a/academic/gelemental/gelemental.SlackBuild
+++ b/academic/gelemental/gelemental.SlackBuild
@@ -1,21 +1,32 @@
 #!/bin/sh
 
 # Slackware build script for gelemental
-# Written by Petar Petrov, <ppetrov@paju.oulu.fi> and 
-# hereby submitted to the public domain
 
-# Based on the gelemental PKGBUILD from Archlinux AUR 
-# (https://aur.archlinux.org/packages.php?ID=10591). 
-# PKGBUILD submitter is Phrodo_00 and maintainer is 
-# chelqo. Thank you!
-
-# THIS SLACKBUILD IS DISTRIBUTETD IN THE HOPE OF BEING 
-# USEFUL BUT WITHOUT ANY WARRANTY. THE AUTHOR IS _NOT_ 
-# RESPONSIBLE FOR ANY DAMAGE OR DATA LOSS CAUSED BY IT.
+# Copyright 2011-2012  Petar Petrov, ppetrov@paju.oulu.fi
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# The patch is from openSUSE (IIRC) and source tarball is from Debian. Thank you!
 
 PRGNAM=gelemental
 VERSION=${VERSION:-1.2.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -51,10 +62,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -jxvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar -xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
 
-# The patch is from Archlinux AUR, as mentioned above. 
-# For AUR it has been taken from Debian. Thank you both!
 patch -p0 -s < $CWD/$PRGNAM-$VERSION-gcc43.patch
 
 cd $PRGNAM-$VERSION
@@ -66,9 +75,10 @@ find . \
  -exec chmod 644 {} \;
 
 # Change the menu category to "Education"
-cd data
-sed "s:Categories=GTK;Utility;Science;Chemistry;:Categories=Education;:" -i gelemental.desktop.in
-cd ..
+sed -i "s:Categories=GTK;Utility;Science;Chemistry;:Categories=Education;:" data/gelemental.desktop.in
+
+# Increase the info button size
+sed -i "s:set_size_request (50, 50):set_size_request (64, 64):" src/buttons.cc
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -91,7 +101,9 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL README NEWS TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS ChangeLog COPYING COPYING.DATA INSTALL README NEWS NEWS-GPeriodic TODO TRANSLATORS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/academic/gelemental/gelemental.info b/academic/gelemental/gelemental.info
index aee3a4ca2608..fd64ac10831d 100644
--- a/academic/gelemental/gelemental.info
+++ b/academic/gelemental/gelemental.info
@@ -1,10 +1,10 @@
 PRGNAM="gelemental"
 VERSION="1.2.0"
-HOMEPAGE="http://www.kdau.com/projects/gelemental/"
-DOWNLOAD="https://api.opensuse.org/public/source/Education/gelemental/gelemental-1.2.0.tar.bz2"
-MD5SUM="efe3dc7b408c0c8c0b72fdd0733b2fb6"
+HOMEPAGE="http://freecode.com/projects/gelemental"
+DOWNLOAD="http://ftp.debian.org/debian/pool/main/g/gelemental/gelemental_1.2.0.orig.tar.gz"
+MD5SUM="94cc73c76a02f75598f579ff57696805"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Petar Petrov"
 EMAIL="ppetrov@paju.oulu.fi"
-APPROVED="Niels Horn"
+APPROVED="rworkman"
diff --git a/academic/gelemental/slack-desc b/academic/gelemental/slack-desc
index 5e88af218fea..627bbdf6fb1d 100644
--- a/academic/gelemental/slack-desc
+++ b/academic/gelemental/slack-desc
@@ -16,4 +16,4 @@ gelemental:
 gelemental:
 gelemental:
 gelemental:
-gelemental: Home: http://www.kdau.com/projects/gelemental/
+gelemental: