office/tellico: Updated for version 2.1.1

4 files changed, 45 insertions, 30 deletions

diff --git a/office/tellico/doinst.sh b/office/tellico/doinst.sh
index 854e20633d..69d003d68b 100644
--- a/office/tellico/doinst.sh
+++ b/office/tellico/doinst.sh
@@ -1,3 +1,13 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-  ./usr/bin/update-desktop-database -q usr/share/applications
+  /usr/bin/update-desktop-database -q usr/share/applications
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
 fi
diff --git a/office/tellico/slack-desc b/office/tellico/slack-desc
index 043667317a..8ccfe8e216 100644
--- a/office/tellico/slack-desc
+++ b/office/tellico/slack-desc
@@ -14,6 +14,6 @@ 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: Homepage: http://tellico-project.org
 tellico:
 tellico:
diff --git a/office/tellico/tellico.SlackBuild b/office/tellico/tellico.SlackBuild
index 3182af65a4..5f8aef0f05 100644
--- a/office/tellico/tellico.SlackBuild
+++ b/office/tellico/tellico.SlackBuild
@@ -24,7 +24,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tellico
-VERSION=${VERSION:-1.3.5}
+VERSION=${VERSION:-2.1.1}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -35,20 +35,23 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+    SLKCFLAGS="-O2 -fPIC"
+    LIBDIRSUFFIX="64"
 fi
 
-set -e  # Exit on most errors.
+set -e      # Exit on most errors
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -57,25 +60,25 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;   
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  --disable-debug
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
 
-make
-make install-strip DESTDIR=$PKG
+  make VERBOSE=1
+  make install VERBOSE=1 DESTDIR=$PKG
+cd -
 
-( 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
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION 
-cp -a AUTHORS COPYING ChangeLog INSTALL TODO NEWS README tellico.lsm tellico.tips \
+cp -a AUTHORS COPYING ChangeLog tellico.lsm tellico.tips \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -84,4 +87,4 @@ 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
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/tellico/tellico.info b/office/tellico/tellico.info
index 833350bf30..2e4d750a5a 100644
--- a/office/tellico/tellico.info
+++ b/office/tellico/tellico.info
@@ -1,8 +1,10 @@
 PRGNAM="tellico"
-VERSION="1.3.5"
-HOMEPAGE="http://periapsis.org/tellico/"
-DOWNLOAD="http://periapsis.org/tellico/download/tellico-1.3.5.tar.gz"
-MD5SUM="ca5d9db11fa1dd33dfe317ffe095435c"
-MAINTAINER="Michiel van Wessem"
-EMAIL="michiel@slackbuilds.org"
+VERSION="2.1.1"
+HOMEPAGE="http://tellico-project.org/"
+DOWNLOAD="http://tellico-project.org/files/tellico-2.1.1.tar.bz2"
+MD5SUM="1202552737fbba823eeeb73c7be1c827"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Gilcio Amaral"
+EMAIL="gilcio.amaral@gmail.com"
 APPROVED="dsomero"