office/gnokii: Updated for version 0.6.31.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

4 files changed, 9 insertions, 26 deletions

diff --git a/office/gnokii/doinst.sh b/office/gnokii/doinst.sh
index 4e8ba7071d..5fb28930db 100644
--- a/office/gnokii/doinst.sh
+++ b/office/gnokii/doinst.sh
@@ -1,4 +1,3 @@
 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/gnokii/gnokii-0.6.29-pcsc.patch b/office/gnokii/gnokii-0.6.29-pcsc.patch
deleted file mode 100644
index 539c208f5a..0000000000
--- a/office/gnokii/gnokii-0.6.29-pcsc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -rupN gnokii-0.6.29.orig/common/phones/pcsc.c gnokii-0.6.29new/common/phones/pcsc.c
---- gnokii-0.6.29.orig/common/phones/pcsc.c	2010-07-29 08:38:28.000000000 +1000
-+++ gnokii-0.6.29/common/phones/pcsc.c	2010-07-29 08:51:29.000000000 +1000
-@@ -199,8 +199,8 @@ static gn_error get_gn_error(PCSC_IOSTRU
- 	case SCARD_W_UNPOWERED_CARD:
- 	case SCARD_W_RESET_CARD:
- 	case SCARD_W_REMOVED_CARD:
--	case SCARD_W_INSERTED_CARD:
--	 	return GN_ERR_SIMPROBLEM;
-+	/* removed in pscc case SCARD_W_INSERTED_CARD:
-+	 	return GN_ERR_SIMPROBLEM; */
- 	case SCARD_E_NO_MEMORY:
- 		return GN_ERR_MEMORYFULL;
- 	case SCARD_F_WAITED_TOO_LONG:
diff --git a/office/gnokii/gnokii.SlackBuild b/office/gnokii/gnokii.SlackBuild
index ad07283231..cb46cda739 100644
--- a/office/gnokii/gnokii.SlackBuild
+++ b/office/gnokii/gnokii.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright (c) 2008  Andrzej Telszewski <atelszewski@gmail.com>
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
@@ -27,16 +27,14 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=gnokii
-VERSION=${VERSION:-0.6.29}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.6.31}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -75,9 +73,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=3dac96714fba1f06445c15e34af3a0c3ad7eb1ce
-patch -p1 < $CWD/gnokii-0.6.29-pcsc.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -110,6 +105,9 @@ make install DESTDIR=$PKG \
   ringtonedocsdir=/usr/doc/$PRGNAM-$VERSION/sample/ringtone \
   vcaldocsdir=/usr/doc/$PRGNAM-$VERSION/sample/vCalendar \
 
+# Change permission so the script can be executed.
+chmod 0755 $PKG/usr/bin/sendsms
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/office/gnokii/gnokii.info b/office/gnokii/gnokii.info
index 43be9e2b6d..a28cc4d6ef 100644
--- a/office/gnokii/gnokii.info
+++ b/office/gnokii/gnokii.info
@@ -1,8 +1,8 @@
 PRGNAM="gnokii"
-VERSION="0.6.29"
+VERSION="0.6.31"
 HOMEPAGE="http://www.gnokii.org/"
-DOWNLOAD="http://www.gnokii.org/download/gnokii/0.6.x/gnokii-0.6.29.tar.bz2"
-MD5SUM="6111e0158a1129062bda6420db67c313"
+DOWNLOAD="http://www.gnokii.org/download/gnokii/0.6.x/gnokii-0.6.31.tar.bz2"
+MD5SUM="d9627f4a1152d3ea7806df4532850d5f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Andrzej Telszewski"