1 files changed, 9 insertions, 36 deletions
diff --git a/academic/gspiceui/gspiceui.SlackBuild b/academic/gspiceui/gspiceui.SlackBuild
index e2b4180ba0..8375227722 100644
--- a/academic/gspiceui/gspiceui.SlackBuild
+++ b/academic/gspiceui/gspiceui.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gspiceui
-VERSION=${VERSION:-1.0.00}
+VERSION=${VERSION:-1.1.00}
 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
@@ -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"
@@ -69,24 +69,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 make
-make INSTALLDIR=$PKG/usr install
+make DESTDIR=$PKG/usr install
 
 mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps
 cp $CWD/$PRGNAM.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
 chmod -x $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
-mkdir -p $PKG/usr/share/applications
 
-cat <<EOF > $PKG/usr/share/applications/$PRGNAM.desktop
-[Desktop Entry]
-Name=GSpiceUI
-Comment=A GUI to free SPICE circuit simulators
-Encoding=UTF-8
-Type=Application
-Categories=Science
-Exec=gspiceui
-Icon=gspiceui
-StartupNotify=false
-EOF
+mkdir -p $PKG/usr/share/applications
+cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -97,29 +87,12 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a Authors ToDo ReadMe License ChangeLog Install $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cp $CWD/$PRGNAM.png $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.png
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
-
-mkdir -p $PKG/usr/share/applications
-mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps
-cp $CWD/$PRGNAM.png $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
-chmod -x $PKG/usr/share/icons/hicolor/48x48/apps/$PRGNAM.png
-
-cat <<EOF > $PKG/usr/share/applications/$PRGNAM.desktop
-[Desktop Entry]
-Name=GSpiceUI
-Comment=A GUI to free SPICE circuit simulators
-Encoding=UTF-8
-Type=Application
-Categories=Science
-Exec=gspiceui
-Icon=gspiceui
-StartupNotify=false
-EOF
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}