3 files changed, 21 insertions, 5 deletions
diff --git a/source/ap/gutenprint/doinst.sh b/source/ap/gutenprint/doinst.sh
new file mode 100644
index 00000000..aa098420
--- /dev/null
+++ b/source/ap/gutenprint/doinst.sh
@@ -0,0 +1,5 @@
+# Only attempt this on a running system, otherwise we'll catch it
+# in post-install.
+if [ -x /usr/sbin/cups-genppdupdate ]; then
+  chroot . /usr/sbin/cups-genppdupdate 1> /dev/null 2> /dev/null
+fi
diff --git a/source/ap/gutenprint/gutenprint.SlackBuild b/source/ap/gutenprint/gutenprint.SlackBuild
index d4876a93..de08b69f 100755
--- a/source/ap/gutenprint/gutenprint.SlackBuild
+++ b/source/ap/gutenprint/gutenprint.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2015, 2016  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,12 +22,12 @@
 
 
 VERSION=${VERSION:-$(echo gutenprint-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -36,8 +36,8 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -123,7 +123,14 @@ fi
 rm -f $PKG/usr/share/gutenprint/samples/profile.jpg
 rm -f $PKG/usr/doc/gutenprint-${VERSION}/*.pdf
 
+# Post-install script to update existing PPD files in /etc:
+mkdir -p $PKG/var/log/setup
+cp -a $CWD/setup.cups-genppdupdate $PKG/var/log/setup
+chown root:root $PKG/var/log/setup/setup.cups-genppdupdate
+chmod 755 $PKG/var/log/setup/setup.cups-genppdupdate
+
 mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
diff --git a/source/ap/gutenprint/setup.cups-genppdupdate b/source/ap/gutenprint/setup.cups-genppdupdate
new file mode 100644
index 00000000..803d3fc7
--- /dev/null
+++ b/source/ap/gutenprint/setup.cups-genppdupdate
@@ -0,0 +1,4 @@
+#!/bin/sh
+#BLURB="Update Gutenprint PPD files for CUPS."
+
+chroot . /usr/sbin/cups-genppdupdate 1> /dev/null 2> /dev/null