office/tellico: Updated for version 1.3.1

5 files changed, 66 insertions, 33 deletions

diff --git a/office/tellico/README b/office/tellico/README
index 0cb22243ff..aa5132de22 100644
--- a/office/tellico/README
+++ b/office/tellico/README
@@ -1,8 +1,8 @@
 Tellico is an KDE application for keeping track of your collections.  It 
 provides default templates for books, bibliographies, videos, music, coins, 
-stamps, trading cards, comic books, and wines.  Ultimately, I'd like it to be 
-similar in capability to AVCataloger or Readerware, although it's still got a 
-ways to go.
+stamps, trading cards, comic books, and wines.  Ultimately, the goal is for
+it to be similar in capability to AVCataloger or Readerware, although it's 
+still got a ways to go.
 
 Tellico allows you to enter your collection in a catalogue database, saving 
 many different properties like title, author, etc. Two different views of 
diff --git a/office/tellico/doinst.sh b/office/tellico/doinst.sh
new file mode 100644
index 0000000000..22d4849bce
--- /dev/null
+++ b/office/tellico/doinst.sh
@@ -0,0 +1,5 @@
+
+if [ -x usr/bin/update-desktop-database ]; then
+  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/office/tellico/slack-desc b/office/tellico/slack-desc
index 5fce3f2bd3..043667317a 100644
--- a/office/tellico/slack-desc
+++ b/office/tellico/slack-desc
@@ -1,10 +1,18 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler-----------------------------------------------------|
 tellico: Tellico (KDE application for keeping track of your collections)
 tellico:
-tellico: Tellico is an KDE application for keeping track of your collections.
-tellico: It provides default templates for books, bibliographies, videos, music,
-tellico: coins, stamps, trading cards, comic books, and wines.  Ultimately,
-tellico: I'd like it to be similar in capability to AVCataloger or Readerware,
-tellico: although it's still got a ways to go.
+tellico: Tellico is a KDE application for keeping track of your collections.
+tellico: It provides default templates for books, bibliographies, videos, 
+tellico: music, coins, stamps, trading cards, comic books, and wines.
+tellico: Ultimately, the goal is for it to be similar in capability to 
+tellico: AVCataloger or Readerware, although it's still got a ways to go.
 tellico:
 tellico: Homepage: http://www.periapsis.org/tellico/
 tellico:
diff --git a/office/tellico/tellico.SlackBuild b/office/tellico/tellico.SlackBuild
index 1e4475fb4f..eaece199b8 100644
--- a/office/tellico/tellico.SlackBuild
+++ b/office/tellico/tellico.SlackBuild
@@ -1,16 +1,37 @@
 #!/bin/sh
  
 # SlackBuild script for tellico
-# Written by Michiel van Wessem (BP{k}) <michiel.van.wessem@gmail.com>
+# Written by Michiel van Wessem (BP{k}) <michiel@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "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 COPYRIGHT
+# OWNER OR CONTRIBUTORS 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.
 
 PRGNAM=tellico
-VERSION=1.2.11
+VERSION=1.3.1
+ARCH=${ARCH:-i486}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-ARCH=${ARCH:-i486}
 OUTPUT=${OUTPUT:-/tmp}
 
 DOCFILES="AUTHORS COPYING ChangeLog INSTALL TODO NEWS README tellico.lsm tellico.tips"
@@ -21,37 +42,35 @@ elif [ "$ARCH" = "i686" ]; then
     SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e
+
 rm -rf $PKG
-mkdir -p $TMP $PKG
+mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$PRGNAM-$VERSION
-cd $TMP || exit 1
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
- 
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/opt/kde \
+  --prefix=/usr \
   --localstatedir=/var \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --program-prefix="" \
   --program-suffix="" \
-  --disable-debug \
-  || exit 1
+  --disable-debug
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
 
-if [ -d $PKG/opt/kde/share/man ]; then
-    ( cd $PKG/opt/kde/share/man
-    find . -type f -exec gzip -9 {} \;
-    for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-    )
-fi
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION 
 cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
@@ -60,6 +79,7 @@ find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
 mkdir $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.tgz
diff --git a/office/tellico/tellico.info b/office/tellico/tellico.info
index 8fc34ed8bc..ecbc15f431 100644
--- a/office/tellico/tellico.info
+++ b/office/tellico/tellico.info
@@ -1,8 +1,8 @@
 PRGNAM="tellico"
-VERSION="1.2.11"
+VERSION="1.3.1"
 HOMEPAGE="http://periapsis.org/tellico/"
-DOWNLOAD="http://periapsis.org/tellico/download/tellico-1.2.11.tar.gz"
-MD5SUM="7096a02dad2317a1013626cf8226580a"
+DOWNLOAD="http://periapsis.org/tellico/download/tellico-1.3.1.tar.gz"
+MD5SUM="75f5e868c37d08830e4ad9c88a64277a"
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED="David Somero"