Updated package to version 5, thanks to Julian Eckhardt

3 files changed, 27 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9067ad623f08..cbf45bc5215a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kyocera_universal
-	pkgdesc = Kyocera Printing Package for many Kyocera printers (stripped of kdialog4).
-	pkgver = 4.0.0
-	pkgrel = 2
+	pkgdesc = Kyocera Printing Package for many Kyocera printers (stripped of kdialog5).
+	pkgver = 5.0.0
+	pkgrel = 1
 	url = https://www.kyocera.com/
 	install = kyodialog-bin.install
 	arch = i686
@@ -21,10 +21,11 @@ pkgbase = kyocera_universal
 	depends = python2
 	depends = lib32-zlib
 	depends = lib32-libcups
-	source = https://cdn.kyostatics.net/dlc/de/driver/all/kyoceralinuxpackages-20160420-upd-v3.-downloadcenteritem-Single-File.downloadcenteritem.tmp/KyoceraLinux_Ph..._2017.06.15.zip
+	depends = lib32-libdbus
+	source = https://cdn.kyostatics.net/dlc/de/driver/all/kyoceralinuxpackages-20160420-upd-v3.-downloadcenteritem-Single-File.downloadcenteritem.tmp/KyoceraLinux_Phase5-2018.08.29
 	source = python2.patch
-	md5sums = b9f33db54d39d7d49b64564aae4ae559
-	md5sums = 531ee26ed3aed74140c99ca800f5c886
+	md5sums = 0fbc4ddc4ed392dd92f42a119d01072f
+	md5sums = 9a439ff46454c2b0f7c4d2411ba2237e
 
 pkgname = kyocera_universal
 
diff --git a/PKGBUILD b/PKGBUILD
index 779954307db8..144a3c7d366e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,22 @@
 # Maintainer: Dominik Wetzel <dimonok@web.de>
+# Contributor: Julian Eckhardt <julian@eckhardt.fi>
 pkgname=kyocera_universal
-pkgver=4.0.0
-pkgrel=2
-pkgdesc="Kyocera Printing Package for many Kyocera printers (stripped of kdialog4)."
+pkgver=5.0.0
+pkgrel=1
+pkgdesc="Kyocera Printing Package for many Kyocera printers (stripped of kdialog5)."
 arch=('x86_64' 'i386')
 url="https://www.kyocera.com/"
 license=('other')
-depends=('bash-completion' 'cups-filters' 'gcc-libs' 'krb5' 'libcups' 'libgcrypt' 'python2-reportlab' 'zlib' 'python2-pypdf2' 'python2' 'lib32-zlib' 'lib32-libcups')
+depends=('bash-completion' 'cups-filters' 'gcc-libs' 'krb5' 'libcups' 'libgcrypt' 'python2-reportlab' 'zlib' 'python2-pypdf2' 'python2' 'lib32-zlib' 'lib32-libcups' 'lib32-libdbus')
 arch=('i686' 'x86_64')
 makedepends=('unzip' 'wget')
 DLAGENTS=("https::/usr/bin/wget")
-toDwnld="KyoceraLinux_Ph..._2017.06.15.zip" 
+toDwnld="KyoceraLinux_Phase5-2018.08.29" 
 source=("https://cdn.kyostatics.net/dlc/de/driver/all/kyoceralinuxpackages-20160420-upd-v3.-downloadcenteritem-Single-File.downloadcenteritem.tmp/${toDwnld}" 
 python2.patch)
 install=kyodialog-bin.install
-md5sums=('b9f33db54d39d7d49b64564aae4ae559'
-	 '531ee26ed3aed74140c99ca800f5c886')
+md5sums=('0fbc4ddc4ed392dd92f42a119d01072f'
+	 '9a439ff46454c2b0f7c4d2411ba2237e')
 
 if [ "$arch" == "x86_64" ]; then
   _arch="amd64"
@@ -23,13 +24,16 @@ else
   _arch="i386"
 fi
 
-# possible also "Global"
-Region="EU" 
+###########################
+# CHOOSE YOUR REGION HERE #
+###########################
+Region="EU"
+# Region="Global"
 
 prepare() {
   cd $srcdir
-  tar xzf Linux_Phase4_2017.06.15/KyoceraLinuxPackages-20170615.tar.gz -C .
-  ar xv Debian/${Region}/kyodialog_${_arch}/kyodialog_4.0-0_${_arch}.deb
+  tar xzf KyoceraLinux-Phase5-2018.08.29.tar.gz -C .
+  ar xv Debian/${Region}/kyodialog_${_arch}/kyodialog_5.0-0_${_arch}.deb
   tar xzf data.tar.gz -C .
   patch -Np0 -i python2.patch
 }
@@ -37,10 +41,10 @@ prepare() {
 package() {
   # Remove unnecessary stuff
   cd $srcdir
-  rm -r usr/share/kyocera/Python
+  rm -r usr/share/kyocera5/Python
   rm -r usr/share/applications
-  rm usr/share/kyocera/appicon_E.png
-  rm usr/bin/kyodialog4
+  rm usr/share/kyocera5/appicon_F.png
+  rm usr/bin/kyodialog5
   install -D -m644 "usr/share/doc/kyodialog/copyright" "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
   rm -r ${srcdir}/usr/share/doc
   cd $pkgdir
diff --git a/python2.patch b/python2.patch
index 3013ef87e372..438a0a0d988c 100644
--- a/python2.patch
+++ b/python2.patch
@@ -1,6 +1,6 @@
 diff -ura --color usr/lib/cups/filter/kyofilter_pre_E usr.new/lib/cups/filter/kyofilter_pre_E
---- usr/lib/cups/filter/kyofilter_pre_E	2017-06-16 00:08:17.000000000 +0200
-+++ usr.new/lib/cups/filter/kyofilter_pre_E	2017-11-06 11:27:56.626675376 +0100
+--- usr/lib/cups/filter/kyofilter_pre_F	2018-08-29 23:29:10.000000000 +0200
++++ usr.new/lib/cups/filter/kyofilter_pre_F	2018-10-19 18:44:58.088191826 +0200
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#! /usr/bin/env python2