development/cupsddk: Updated for version 1.2.2

4 files changed, 17 insertions, 21 deletions

diff --git a/development/cupsddk/README b/development/cupsddk/README
index 42bf83e9f4..c8ae9123cf 100644
--- a/development/cupsddk/README
+++ b/development/cupsddk/README
@@ -4,10 +4,3 @@ drivers for CUPS and other printing environments. CUPS provides a portable
 printing layer for UNIX(R)-based operating systems. The CUPS DDK provides 
 the means for mass-producing PPD files and drivers/filters for CUPS-based 
 printer drivers.
-
-Requirements: cups >= 1.2.x
-
-*NOTE*: Slackware 11.0 does not come wit cups 1.2.x installed by default. 
-However, there is a package under testing/packages/cups-1.2.4/ on either
-your local install-media or your slackware-mirror.
-
diff --git a/development/cupsddk/cupsddk.SlackBuild b/development/cupsddk/cupsddk.SlackBuild
index 98844a1565..2dfbdfe5d9 100644
--- a/development/cupsddk/cupsddk.SlackBuild
+++ b/development/cupsddk/cupsddk.SlackBuild
@@ -1,14 +1,14 @@
 #!/bin/sh
 
 # Slackware build script for cupsddk
-# Written by Iskar Enev iskar.enev@gmail.com
+# Written by Iskar Enev <iskar.enev[@]gmail.com>
 
 PRGNAM=cupsddk
-VERSION=1.1.1
+VERSION=1.2.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -28,6 +28,9 @@ cd $PRGNAM-$VERSION || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# foo-fr.po is missing while it's needed at compile time and later for testing purposes.
+( cd ppdc ; ln -sf ../po/fr.po foo-fr.po )
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -41,16 +44,16 @@ CXXFLAGS="$SLKCFLAGS" \
 make || exit 1
 make BUILDROOT=$PKG install || exit 1
 
-(cd $PKG
-	find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-	find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/usr/share/pixmaps/$PRGNAM
 cp -a icons/* $PKG/usr/share/pixmaps/$PRGNAM
 
-cp -a CHANGES.txt CREDITS.txt FAQ.txt INSTALL.txt LICENSE* README.txt \
-	doc/*.html doc/*.xml doc/*.pdf doc/*.book $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt *.html doc/*.html doc/*.xml doc/*.pdf doc/*.book doc/images \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a examples/* $PKG/usr/doc/$PRGNAM-$VERSION/examples
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/cupsddk/cupsddk.info b/development/cupsddk/cupsddk.info
index a52e55fa93..e13a8afae9 100644
--- a/development/cupsddk/cupsddk.info
+++ b/development/cupsddk/cupsddk.info
@@ -1,8 +1,8 @@
 PRGNAM="cupsddk"
-VERSION="1.1.1"
+VERSION="1.2.2"
 HOMEPAGE="http://www.cups.org/ddk/"
-DOWNLOAD="http://ftp.easysw.com/pub/cupsddk/1.1.1/cupsddk-1.1.1-source.tar.bz2"
-MD5SUM="0e067d6d16d0e17a0218aa5eabda8134"
+DOWNLOAD="http://ftp.easysw.com/pub/cupsddk/1.2.2/cupsddk-1.2.2-source.tar.bz2"
+MD5SUM="2fca7f28798aac33935e4a0450f9351c"
 MAINTAINER="Iskar Enev"
 EMAIL="iskar.enev@gmail.com"
-APPROVED="BP{k}"
+APPROVED="rworkman"
diff --git a/development/cupsddk/slack-desc b/development/cupsddk/slack-desc
index 9399099e4e..51bb13cc9e 100644
--- a/development/cupsddk/slack-desc
+++ b/development/cupsddk/slack-desc
@@ -5,8 +5,8 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-		 |-----handy-ruler---------------------------------------------------------|
-cupsddk: cupsddk
+       |-----handy-ruler---------------------------------------------------------|
+cupsddk: cupsddk (CUPS Driver Development Kit)
 cupsddk:
 cupsddk: The CUPS Driver Development Kit (DDK) provides a suite of standard 
 cupsddk: drivers, a PPD file compiler, and other utilities that can be used to