summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-07-09 13:36:24 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-07-12 22:47:46 +0700
commit58f327e413abf87978a451dbc884926bfbc4847e (patch)
treee5b7642c9b14f3b439f8bd00d3c1a14a8ed0cf79
parent7cac8f28459640717e29d3d4b15e343fc7df70a4 (diff)
downloadslackbuilds-58f327e413abf87978a451dbc884926bfbc4847e.tar.gz
office/wink: Link to correct libexpat.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--office/wink/wink.SlackBuild20
1 files changed, 13 insertions, 7 deletions
diff --git a/office/wink/wink.SlackBuild b/office/wink/wink.SlackBuild
index 333a15610b..7e79a5b7d6 100644
--- a/office/wink/wink.SlackBuild
+++ b/office/wink/wink.SlackBuild
@@ -6,7 +6,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
@@ -17,8 +17,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"
@@ -42,10 +42,10 @@ cd $PRGNAM-$VERSION
tar xvf $CWD/wink15.tar.gz
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
mkdir -p $PKG/usr/share/wink
cd $PKG/usr/share/wink
@@ -64,6 +64,12 @@ WINK_INSTALL_DIR=/usr/share/wink /usr/share/wink/wink
__EOF__
chmod a+rx $PKG/usr/bin/wink
+(
+ mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+ cd $PKG/usr/lib${LIBDIRSUFFIX}
+ ln -s /usr/lib${LIBDIRSUFFIX}/libexpat.so.1 libexpat.so.0
+)
+
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cd $PKG/usr/doc/$PRGNAM-$VERSION
mv $PKG/usr/share/wink/{changelog,license,readme}.txt .