misc/KeePass: Updated for version 2.34.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 18 insertions, 14 deletions

diff --git a/misc/KeePass/KeePass.SlackBuild b/misc/KeePass/KeePass.SlackBuild
index 2fec14ad92..720cc2a8c1 100644
--- a/misc/KeePass/KeePass.SlackBuild
+++ b/misc/KeePass/KeePass.SlackBuild
@@ -18,13 +18,13 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=KeePass
-VERSION=${VERSION:-2.30}
+VERSION=${VERSION:-2.34}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -35,8 +35,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -72,16 +72,16 @@ find -L . \
 
 # Generate icons
 ICON_SIZES="256x256 192x192 128x128 96x96 64x64 48x48 32x32 16x16"
-ICON_FILES=$(ls $TMP/$PRGNAM-$VERSION/$PRGNAM-$VERSION-Source/Ext/Icons/Finals |grep png)
+ICON_FILES=$(ls $TMP/$PRGNAM-$VERSION/$PRGNAM-$VERSION-Source/Ext/Icons_04_CB/Finals | grep png)
 for i in $ICON_SIZES ; do
   mkdir -p $PKG/usr/share/icons/hicolor/$i/apps
   for j in $ICON_FILES; do
     if [ "$i" == "256x256" ];then
-      cp $TMP/$PRGNAM-$VERSION/$PRGNAM-$VERSION-Source/Ext/Icons/Finals/$j \
+      cp $TMP/$PRGNAM-$VERSION/$PRGNAM-$VERSION-Source/Ext/Icons_04_CB/Finals/$j \
          $PKG/usr/share/icons/hicolor/$i/apps/KeePass-$j
     else
       convert -resize $i \
-        $TMP/$PRGNAM-$VERSION/$PRGNAM-$VERSION-Source/Ext/Icons/Finals/$j \
+        $TMP/$PRGNAM-$VERSION/$PRGNAM-$VERSION-Source/Ext/Icons_04_CB/Finals/$j \
         $PKG/usr/share/icons/hicolor/$i/apps/KeePass-$j
     fi
   done
@@ -89,9 +89,10 @@ done
 
 mkdir -p $PKG/usr/lib
 cp -a $PRGNAM-$VERSION $PKG/usr/lib/
+mv $PKG/usr/lib/$PRGNAM-$VERSION $PKG/usr/lib/$PRGNAM
 
 mkdir -p $PKG/usr/bin
-echo -e '#!/bin/bash'"\nexec /usr/bin/mono /usr/lib/KeePass-${VERSION}/KeePass.exe" > $PKG/usr/bin/keepass
+echo -e '#!/bin/bash'"\nexec /usr/bin/mono /usr/lib/KeePass/KeePass.exe" > $PKG/usr/bin/keepass
 chmod 0755 $PKG/usr/bin/keepass
 
 mkdir -p $PKG/usr/share/applications
@@ -99,6 +100,9 @@ cp $CWD/files/KeePass.desktop $PKG/usr/share/applications/
 chmod 0644 $PKG/usr/share/applications/KeePass.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/lib/$PRGNAM/License.txt \
+  $PKG/usr/lib/$PRGNAM/$PRGNAM.chm \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/misc/KeePass/KeePass.info b/misc/KeePass/KeePass.info
index 48cc7a4dd2..e4e6926319 100644
--- a/misc/KeePass/KeePass.info
+++ b/misc/KeePass/KeePass.info
@@ -1,12 +1,12 @@
 PRGNAM="KeePass"
-VERSION="2.30"
+VERSION="2.34"
 HOMEPAGE="http://keepass.info/"
-DOWNLOAD="http://downloads.sourceforge.net/keepass/KeePass-2.30.zip \
-          http://downloads.sourceforge.net/keepass/KeePass-2.30-Source.zip"
-MD5SUM="b73b9fc520e47f47c517be1048be7aec \
-        9296808e4c30d1de4eb182bab521d864"
+DOWNLOAD="http://downloads.sourceforge.net/keepass/KeePass-2.34.zip \
+          http://downloads.sourceforge.net/keepass/KeePass-2.34-Source.zip"
+MD5SUM="c6ee6dd8c8fb4e6db466a2da76bd3929 \
+        d810976648df7e16053801d250962cdf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="mono libgdiplus"
+REQUIRES="mono"
 MAINTAINER="Shrivatsan Sampathkumar"
 EMAIL="nastavs [at] gmail [dot] com"