From 9ffc6df335b55d100ef3091d6f7eed203cdd8022 Mon Sep 17 00:00:00 2001
From: "Edinaldo P. Silva" <edps.mundognu@gmail.com>
Date: Sun, 13 Nov 2016 23:26:06 +0000
Subject: desktop/obkey: Switch to i586.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 desktop/obkey/obkey.SlackBuild | 14 ++++++--------
 desktop/obkey/obkey.info       |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'desktop')

diff --git a/desktop/obkey/obkey.SlackBuild b/desktop/obkey/obkey.SlackBuild
index 06945aa127247..e5f85cf2240ed 100644
--- a/desktop/obkey/obkey.SlackBuild
+++ b/desktop/obkey/obkey.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for obkey.
 #
-# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2016 Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,12 @@
 
 PRGNAM=obkey
 VERSION=${VERSION:-1.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 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
@@ -40,8 +40,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"
@@ -56,13 +56,11 @@ fi
 
 set -e
 
-SRCVER="v1.0"
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCVER.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/desktop/obkey/obkey.info b/desktop/obkey/obkey.info
index 43e7aed7782af..52d1d75f8bb14 100644
--- a/desktop/obkey/obkey.info
+++ b/desktop/obkey/obkey.info
@@ -1,7 +1,7 @@
 PRGNAM="obkey"
 VERSION="1.0"
 HOMEPAGE="https://github.com/nsf/obkey/"
-DOWNLOAD="https://github.com/nsf/obkey/archive/v1.0.tar.gz"
+DOWNLOAD="https://github.com/nsf/obkey/archive/v1.0/obkey-1.0.tar.gz"
 MD5SUM="41686cfe4708fe304a16163496fa05d8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-- 
cgit v1.2.3