summaryrefslogtreecommitdiff
path: root/gis/josm/josm.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'gis/josm/josm.SlackBuild')
-rw-r--r--gis/josm/josm.SlackBuild14
1 files changed, 8 insertions, 6 deletions
diff --git a/gis/josm/josm.SlackBuild b/gis/josm/josm.SlackBuild
index 544c107c92..bdf16fd7d6 100644
--- a/gis/josm/josm.SlackBuild
+++ b/gis/josm/josm.SlackBuild
@@ -8,13 +8,13 @@
# execute the script passing it VERSION=tested
PRGNAM=josm
-VERSION=${VERSION:-5608}
+VERSION=${VERSION:-11526}
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
@@ -25,8 +25,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"
@@ -65,8 +65,10 @@ cp $TMP/$PRGNAM/$PRGNAM $PKG/usr/bin/
mkdir -p $PKG/usr/share/applications
mkdir -p $PKG/usr/share/$PRGNAM
cp -a $CWD/$PRGNAM.desktop $PKG/usr/share/applications
-cp -a $CWD/$PRGNAM\_120.xpm $PKG/usr/share/$PRGNAM/
-cp -a $CWD/$PRGNAM\_64.xpm $PKG/usr/share/$PRGNAM/
+mkdir -p $PKG/usr/share/icons/hicolor/160x160/apps/$PRGNAM/
+mkdir -p $PKG/usr/share/icons/hicolor/64x64/apps/$PRGNAM/
+cp -a $CWD/$PRGNAM\_160.xpm $PKG/usr/share/icons/hicolor/160x160/apps/$PRGNAM/$PRGNAM.xpm
+cp -a $CWD/$PRGNAM\_64.xpm $PKG/usr/share/icons/hicolor/64x64/apps/$PRGNAM/$PRGNAM.xpm
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild