3 files changed, 26 insertions, 18 deletions
diff --git a/office/epdfview/doinst.sh b/office/epdfview/doinst.sh
index 7ebfa3ab4d..f39d8d4dfa 100644
--- a/office/epdfview/doinst.sh
+++ b/office/epdfview/doinst.sh
@@ -1,3 +1,3 @@
-if [ -x usr/bin/update-desktop-database ]; then
-    usr/bin/update-desktop-database -q usr/share/applications
+if [ -x /usr/bin/update-desktop-database ]; then
+    /usr/bin/update-desktop-database -q usr/share/applications
 fi
diff --git a/office/epdfview/epdfview.SlackBuild b/office/epdfview/epdfview.SlackBuild
index 137027677a..9f316d4cca 100644
--- a/office/epdfview/epdfview.SlackBuild
+++ b/office/epdfview/epdfview.SlackBuild
@@ -23,13 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by the SlackBuilds.org project
-set -e
 
 PRGNAM=epdfview
 VERSION=0.1.6
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG=_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-epdfview
@@ -37,42 +37,50 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
 tar xvjf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION || exit 1
+cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+find . \
+ \( -perm 777 -o -perm 775 -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 {} \;
 
 # Add patch for printing segfault
-patch -Np0 -i $CWD/epdfview-0.1.6-print-segfault.patch || exit 1
+patch -Np0 -i $CWD/epdfview-0.1.6-print-segfault.patch
 
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/usr \
-  || exit 1
+  --prefix=/usr
+
+make
+make install-strip DESTDIR=$PKG
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+# Add some default icons
+install -d $PKG/usr/share/icons/hicolor/{24x24,32x32,48x48}/apps
+install -m644 data/icon_epdfview-24.png "$PKG/usr/share/icons/hicolor/24x24/apps/epdfview.png"
+install -m644 data/icon_epdfview-32.png "$PKG/usr/share/icons/hicolor/32x32/apps/epdfview.png"
+install -m644 data/icon_epdfview-48.png "$PKG/usr/share/icons/hicolor/48x48/apps/epdfview.png"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Fix path to icons in .desktop file
-sed -i 's#Icon=postscript-viewer.png#Icon=/usr/share/icons/gnome/32x32/apps/postscript-viewer.png#' $PKG/usr/share/applications/$PRGNAM.desktop
+sed -i 's#Icon=postscript-viewer.png#Icon=epdfview#' $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/office/epdfview/epdfview.info b/office/epdfview/epdfview.info
index fba4a72118..3ed66031e4 100644
--- a/office/epdfview/epdfview.info
+++ b/office/epdfview/epdfview.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://trac.emma-soft.com/epdfview/chrome/site/releases/epdfview-0.1.6
 MD5SUM="cce9edb41b4a8308e0ef0eea24b5a1ab"
 MAINTAINER="Andrew Brouwers"
 EMAIL="abrouwers@gmail.com"
-APPROVED="BP{k}"
+APPROVED="dsomero"