summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-07-04 20:20:46 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-07-05 08:52:30 +0700
commit92285c04f32e3b7095198b0df5e6da885958e4bb (patch)
treea024afdf15d8399dbc107b7fe7046a083a925f1a
parentc75ff6e61c4f3563c52d0c16ac93f23df2865b74 (diff)
downloadslackbuilds-92285c04f32e3b7095198b0df5e6da885958e4bb.tar.gz
network/ccnet: Fix tarball handling.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--network/ccnet/ccnet.SlackBuild8
-rw-r--r--network/ccnet/ccnet.info2
2 files changed, 5 insertions, 5 deletions
diff --git a/network/ccnet/ccnet.SlackBuild b/network/ccnet/ccnet.SlackBuild
index 20e30699df..a357b3a0f4 100644
--- a/network/ccnet/ccnet.SlackBuild
+++ b/network/ccnet/ccnet.SlackBuild
@@ -31,7 +31,7 @@ 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
@@ -42,8 +42,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"
@@ -62,7 +62,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION-server
-tar xvf $CWD/v$VERSION-server.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION-server.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION-server.tar.gz
cd $PRGNAM-$VERSION-server
chown -R root:root .
find -L . \
diff --git a/network/ccnet/ccnet.info b/network/ccnet/ccnet.info
index c08cb29acd..a796b40262 100644
--- a/network/ccnet/ccnet.info
+++ b/network/ccnet/ccnet.info
@@ -1,7 +1,7 @@
PRGNAM="ccnet"
VERSION="4.4.6"
HOMEPAGE="http://seafile.com/"
-DOWNLOAD="https://github.com/haiwen/ccnet/archive/v4.4.6-server.tar.gz"
+DOWNLOAD="https://github.com/haiwen/ccnet/archive/v4.4.6-server/ccnet-4.4.6-server.tar.gz"
MD5SUM="bff067e61d0af043b761027fdd840314"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""