diff options
| -rw-r--r-- | libraries/libopenraw/doinst.sh | 24 | ||||
| -rw-r--r-- | libraries/libopenraw/libopenraw.SlackBuild | 6 |
2 files changed, 3 insertions, 27 deletions
diff --git a/libraries/libopenraw/doinst.sh b/libraries/libopenraw/doinst.sh deleted file mode 100644 index 234ad26971369..0000000000000 --- a/libraries/libopenraw/doinst.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/$PRGNAM.conf.new - -if [ -x usr/bin/update-desktop-database ]; then - usr/bin/update-desktop-database -q usr/share/applications -fi - -if [ -x usr/bin/update-mime-database ]; then - usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 -fi diff --git a/libraries/libopenraw/libopenraw.SlackBuild b/libraries/libopenraw/libopenraw.SlackBuild index c35a8b6e27259..14bd615166095 100644 --- a/libraries/libopenraw/libopenraw.SlackBuild +++ b/libraries/libopenraw/libopenraw.SlackBuild @@ -30,7 +30,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 @@ -41,8 +41,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" |