system/epson-inkjet-printer-escpr2: Updated for version 1.1.49.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 34 insertions, 32 deletions

diff --git a/system/epson-inkjet-printer-escpr2/README.models b/system/epson-inkjet-printer-escpr2/README.models
index d1c0c1f8cf59d..7a427e3389710 100644
--- a/system/epson-inkjet-printer-escpr2/README.models
+++ b/system/epson-inkjet-printer-escpr2/README.models
@@ -28,17 +28,17 @@ PX-S5010 Series, PX-S5080 Series, PX-S6010 Series, PX-S6710T Series
 PX-S7070X, PX-S7090X, PX-S7110, PX-S7110P, PX-S880X, PX-S884, PX-S885
 ST-3000 Series, ST-4000 Series, ST-C4100 Series, ST-C8000 Series
 ST-C8090 Series, ST-M1000 Series, ST-M3000 Series, WF-2860 Series
-WF-2880 Series, WF-3720 Series, WF-3730 Series, WF-3820 Series
-WF-4720 Series, WF-4730 Series, WF-4740 Series, WF-4820 Series
-WF-4830 Series, WF-7210 Series, WF-7310 Series, WF-7710 Series
-WF-7720 Series, WF-7820 Series, WF-7830 Series, WF-7840 Series
-WF-C4810 Series, WF-C5210 Series, WF-C5290 Series, WF-C5290BA
-WF-C5290BAM, WF-C529R Series, WF-C529RB, WF-C529RBAM, WF-C5710 Series
-WF-C5790 Series, WF-C5790BA, WF-C579R Series, WF-C579RB, WF-C579RBAM
-WF-C5890BAM, WF-C8190 Series, WF-C8190B, WF-C8610 Series
-WF-C8690 Series, WF-C8690B, WF-C869R Series, WF-C878R Series, WF-C878RB
-WF-C879R Series, WF-C879RB, WF-C879RBAM, WF-M5298 Series
-WF-M5299 Series, WF-M5299BAM, WF-M5799 Series, WF-M5799BAM
-XP-15000 Series, XP-5100 Series, XP-5150 Series, XP-6000 Series
-XP-6100 Series, XP-8500 Series, XP-8600 Series, XP-8700 Series
-XP-970 Series
+WF-2880 Series, WF-2960 Series, WF-3720 Series, WF-3730 Series
+WF-3820 Series, WF-4720 Series, WF-4730 Series, WF-4740 Series
+WF-4820 Series, WF-4830 Series, WF-7210 Series, WF-7310 Series
+WF-7710 Series, WF-7720 Series, WF-7820 Series, WF-7830 Series
+WF-7840 Series, WF-C4810 Series, WF-C5210 Series, WF-C5290 Series
+WF-C5290BA, WF-C5290BAM, WF-C529R Series, WF-C529RB, WF-C529RBAM
+WF-C5710 Series, WF-C5790 Series, WF-C5790BA, WF-C579R Series
+WF-C579RB, WF-C579RBAM, WF-C5890BAM, WF-C8190 Series, WF-C8190B
+WF-C8610 Series, WF-C8690 Series, WF-C8690B, WF-C869R Series
+WF-C878R Series, WF-C878RB, WF-C879R Series, WF-C879RB, WF-C879RBAM
+WF-M5298 Series, WF-M5299 Series, WF-M5299BAM, WF-M5799 Series
+WF-M5799BAM, XP-15000 Series, XP-5100 Series, XP-5150 Series
+XP-5200 Series, XP-6000 Series, XP-6100 Series, XP-8500 Series
+XP-8600 Series, XP-8700 Series, XP-970 Series
diff --git a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
index c36ea40bb94ef..f12770aca6465 100644
--- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
+++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.SlackBuild
@@ -32,10 +32,10 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=epson-inkjet-printer-escpr2
-VERSION=${VERSION:-1.1.48}
+VERSION=${VERSION:-1.1.49}
 EXTRABIT=1lsb3.2
 TARNAM=$PRGNAM-$VERSION-$EXTRABIT.tar.gz
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -55,15 +55,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
-#lets get the source tarball from the rpm and clean up the bits we don't need
-rpm2tgz $PRGNAM-$VERSION-$EXTRABIT.src.rpm
-tar -xzf $PRGNAM-$VERSION-$EXTRABIT.src.tgz
-cp $PRGNAM-$VERSION-$EXTRABIT/$PRGNAM-$VERSION-$EXTRABIT.tar.gz ./
-rm $PRGNAM-$VERSION-$EXTRABIT.src.tgz
-rm -r $PRGNAM-$VERSION-$EXTRABIT
-rm -f lsb-rpm.spec
-
 TMP=${TMP:-/tmp/SBo}
+EXTRACTTMP=${TMP}/epson-inkjet-printer-escpr2-src
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -84,13 +77,20 @@ fi
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
+mkdir -p $TMP $PKG $OUTPUT $EXTRACTTMP
+#lets get the source tarball from the rpm and clean up the bits we don't need
+cd $EXTRACTTMP
+rpm2tgz $CWD/$PRGNAM-$VERSION-$EXTRABIT.src.rpm
+tar -xzf $PRGNAM-$VERSION-$EXTRABIT.src.tgz
+cp $PRGNAM-$VERSION-$EXTRABIT/$PRGNAM-$VERSION-$EXTRABIT.tar.gz ./
+rm $PRGNAM-$VERSION-$EXTRABIT.src.tgz
+rm -r $PRGNAM-$VERSION-$EXTRABIT
+rm -f lsb-rpm.spec
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$TARNAM
-#we remove the tarnam as the original is an rpm
-#this keeps things tidy.
-rm $CWD/$TARNAM
+tar xvf $EXTRACTTMP/$TARNAM
+#lets remove our temp extraction directory
+rm -rf $EXTRACTTMP
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -118,7 +118,9 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+#fix ownership of licence file.
 cp -a $CWD/LICENCE.html COPYING COPYING.EPSON COPYING.LIB README AUTHORS ChangeLog NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+chown root:root $PKG/usr/doc/$PRGNAM-$VERSION/LICENCE.html
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 rm -f $PKG/usr/lib*/*.la
diff --git a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
index 5123e86fcb3c8..3ea1bb1e54435 100644
--- a/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
+++ b/system/epson-inkjet-printer-escpr2/epson-inkjet-printer-escpr2.info
@@ -1,8 +1,8 @@
 PRGNAM="epson-inkjet-printer-escpr2"
-VERSION="1.1.48"
+VERSION="1.1.49"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-inkjet-printer-escpr2-1.1.48-1lsb3.2.src.rpm"
-MD5SUM="e741e23022388b2fa310d36279cf97aa"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/epson-printer/epson-inkjet-printer-escpr2-1.1.49-1lsb3.2.src.rpm"
+MD5SUM="aa697a058110f87f20368a35ef47742f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""