5 files changed, 15 insertions, 78 deletions
diff --git a/graphics/makehuman/README b/graphics/makehuman/README
index d4c5c81782..4cf570d28b 100644
--- a/graphics/makehuman/README
+++ b/graphics/makehuman/README
@@ -1,2 +1,2 @@
-MakeHuman is an open source (so it's completely free), innovative and 
+MakeHuman is an open source (so it's completely free), innovative and
 professional software for the modelling of 3-Dimensional humanoid characters.
diff --git a/graphics/makehuman/makehuman.SlackBuild b/graphics/makehuman/makehuman.SlackBuild
index 0f57d5e965..accca06feb 100644
--- a/graphics/makehuman/makehuman.SlackBuild
+++ b/graphics/makehuman/makehuman.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for makehuman
 
-# Copyright 2012  Giorgio Peron Campodarsego, PD, Italy giorgio.peron@gmail.com
+# Copyright 2012-2014 Giorgio Peron, Campodarsego, PD, Italy giorgio.peron@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=makehuman
-VERSION=${VERSION:-1.0a7}
+VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,72 +40,22 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-  BINDIRSUFFIX="32bit"
-  ARCH1="i386"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-  BINDIRSUFFIX="32bit"
-  ARCH1="i386"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  BINDIRSUFFIX="64bit"
-  ARCH1="amd64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xjvf $CWD/$PRGNAM-$VERSION-python27-$ARCH1.tbz2
-cd $PRGNAM
-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 {} \;
-
-scons
-mkdir -p $PKG/usr/bin
-mkdir -p $PKG/usr/share/makehuman
-cp -a \
-  main.py \
-  makehuman \
-  mh_icon.bmp \
-  setup.nsi \
-  $PKG/usr/share/makehuman
-cp -r $TMP/$PRGNAM/apps $PKG/usr/share/makehuman
-cp -r $CWD/makehuman.sh $PKG/usr/bin/makehuman
-chmod +x $PKG/usr/bin/makehuman
-cp -r $TMP/$PRGNAM/core $PKG/usr/share/makehuman
-cp -r $TMP/$PRGNAM/data $PKG/usr/share/makehuman
-cp -r $TMP/$PRGNAM/etc $PKG/usr/share/makehuman
-cp -r $TMP/$PRGNAM/importers $PKG/usr/share/makehuman
-cp -r $TMP/$PRGNAM/plugins $PKG/usr/share/makehuman
-cp -r $TMP/$PRGNAM/shared $PKG/usr/share/makehuman
-cp -r $TMP/$PRGNAM/utils $PKG/usr/share/makehuman
-cp -r $TMP/$PRGNAM/tools $PKG/usr/share/makehuman
-mkdir -p $PKG/usr/share/applications
-cp -r $CWD/makehuman.desktop $PKG/usr/share/applications
+# pure Python program
+rpm -i --nodeps --root $PKG $CWD/$PRGNAM-$VERSION-1.noarch.rpm
 
 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
 
+rm -rf $PKG/var
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  license.txt \
-  docs \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/$PRGNAM/licenses $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/$PRGNAM/license.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/graphics/makehuman/makehuman.desktop b/graphics/makehuman/makehuman.desktop
deleted file mode 100644
index bbb166be88..0000000000
--- a/graphics/makehuman/makehuman.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=MakeHuman alpha 7
-Comment=Generate 3D humanoid models
-Exec=makehuman
-Icon=/usr/share/makehuman/mh_icon.bmp
-Terminal=false
-Categories=Graphics
-StartupNotify=true
diff --git a/graphics/makehuman/makehuman.info b/graphics/makehuman/makehuman.info
index d7d1366885..3d9e751d89 100644
--- a/graphics/makehuman/makehuman.info
+++ b/graphics/makehuman/makehuman.info
@@ -1,10 +1,10 @@
 PRGNAM="makehuman"
-VERSION="1.0a7"
+VERSION="1.0.0"
 HOMEPAGE="http://www.makehuman.org"
-DOWNLOAD="https://makehuman.googlecode.com/files/makehuman-1.0a7-python27-i386.tbz2"
-MD5SUM="76cf114ea47459b1285b49050d56d1f9"
-DOWNLOAD_x86_64="https://makehuman.googlecode.com/files/makehuman-1.0a7-python27-amd64.tbz2"
-MD5SUM_x86_64="c740df48ad5aad5d66929c31f1271f7f"
-REQUIRES="scons"
+DOWNLOAD="http://download.tuxfamily.org/makehuman/releases/1.0.0/makehuman-1.0.0-1.noarch.rpm"
+MD5SUM="0af87ce08789979531fd8bf87caf7b4b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="PyOpenGL"
 MAINTAINER="Giorgio Peron"
 EMAIL="giorgio.peron@gmail.com"
diff --git a/graphics/makehuman/makehuman.sh b/graphics/makehuman/makehuman.sh
deleted file mode 100644
index a46e32537a..0000000000
--- a/graphics/makehuman/makehuman.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd /usr/share/makehuman
-./makehuman >/dev/null 2>&1