updated patch file and sums

3 files changed, 28 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1c3bafba05e..50a96ffc6969 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Mar 27 10:43:23 UTC 2016
+# Tue Jun  7 10:42:11 UTC 2016
 pkgbase = foo2zjs
 	pkgdesc = foo2zjs Printer Drivers. Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers.
-	pkgver = 20160313
+	pkgver = 20160607
 	pkgrel = 1
 	url = http://foo2zjs.rkkda.com/
 	install = foo2zjs.install
@@ -22,13 +22,13 @@ pkgbase = foo2zjs
 	conflicts = foo2zjs-testing
 	options = !emptydirs
 	options = !ccache
-	source = foo2zjs-20160313.tar.gz::http://foo2zjs.rkkda.com/foo2zjs.tar.gz
+	source = http://foo2zjs.rkkda.com/foo2zjs.tar.gz
 	source = destdir-support-20140329-1.patch
 	source = gen-fixes-20140329-1.patch
 	source = firmware-loader-20130602-1.patch
 	source = udev-firmware-loading-ruleset-20130601-1.patch
-	sha256sums = SKIP
-	sha256sums = 6dbbbc0632833f2ef142f90d176a45bbdbb6f38fc674f9582c5a2fde0480bcd5
+	sha256sums = 69f0b9baa94470a8936002fb0d46c37980b7654eb1e21292e22e2cbbb13ca650
+	sha256sums = 6fe2abe505305c627e35123ffdf80279b0e6e065b34a1967674fe56f09380f6a
 	sha256sums = 2a104b8f93d8cb4bd0a10156043f9cf47eddaa728f6317d235bc6d9843312f05
 	sha256sums = 5fe072326173d5008741ffed2e122053f821eabc0d3369ef64a2e346e4e327d1
 	sha256sums = 32c2ccf07eb0be50f2d27e976de6383795ff1755f72965e47c238825621c459d
diff --git a/PKGBUILD b/PKGBUILD
index d7071f3e07f6..78199449d6a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-#Maintainer: Nicola Bignami <nicola@kernel-panic.no-ip.net>
+#Maintainer: Peter Reschenhofer <peter.reschenhofer@gmail.com>
+#Contributor: Nicola Bignami <nicola@kernel-panic.no-ip.net>
 #Contributor: Muhammed Uluyol <uluyol0@gmail.com>
 
 pkgname=foo2zjs
-pkgver=20160313
+pkgver=20160607
 pkgrel=1
 pkgdesc="foo2zjs Printer Drivers. Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers."
 url="http://foo2zjs.rkkda.com/"
@@ -15,14 +16,14 @@ optdepends=('tix: required by hplj10xx_gui.tcl')
 arch=('i686' 'x86_64')
 options=('!emptydirs' '!ccache')
 install='foo2zjs.install'
-source=("foo2zjs-${pkgver}.tar.gz::http://foo2zjs.rkkda.com/foo2zjs.tar.gz"
+source=("http://foo2zjs.rkkda.com/foo2zjs.tar.gz"
         'destdir-support-20140329-1.patch'
 	'gen-fixes-20140329-1.patch'
 	'firmware-loader-20130602-1.patch'
 	'udev-firmware-loading-ruleset-20130601-1.patch')
 
-sha256sums=('SKIP'
-            '6dbbbc0632833f2ef142f90d176a45bbdbb6f38fc674f9582c5a2fde0480bcd5'
+sha256sums=('69f0b9baa94470a8936002fb0d46c37980b7654eb1e21292e22e2cbbb13ca650'
+            '6fe2abe505305c627e35123ffdf80279b0e6e065b34a1967674fe56f09380f6a'
             '2a104b8f93d8cb4bd0a10156043f9cf47eddaa728f6317d235bc6d9843312f05'
             '5fe072326173d5008741ffed2e122053f821eabc0d3369ef64a2e346e4e327d1'
             '32c2ccf07eb0be50f2d27e976de6383795ff1755f72965e47c238825621c459d')
diff --git a/destdir-support-20140329-1.patch b/destdir-support-20140329-1.patch
index 408dd9ff594f..972bcb3ef43e 100644
--- a/destdir-support-20140329-1.patch
+++ b/destdir-support-20140329-1.patch
@@ -1,18 +1,6 @@
-Maintainer: Nicola Bignami <nicola@kernel-panic.dnsdojo.net>
-Contributor: Muhammed Uluyol <uluyol0@gmail.com>
-Subject: [PATCH] Destdir support
-
 --- a/Makefile
 +++ b/Makefile
-@@ -18,7 +18,6 @@ VERSION=0.0
- 
- # Installation prefix...
- PREFIX=/usr/local
--PREFIX=/usr
- PREFIX=$(DESTDIR)/usr
- 
- # Pathnames for this package...
-@@ -38,7 +37,7 @@ INSTALL=install
+@@ -38,7 +38,7 @@
  ROOT=root
  
  # Pathnames for referenced packages...
@@ -21,26 +9,19 @@ Subject: [PATCH] Destdir support
  
  # User ID's
  LPuid=-oroot
-@@ -249,7 +250,7 @@ # CUPS vars
+@@ -245,8 +245,9 @@
+ 
+ # CUPS vars
  CUPS_SERVERBIN := $(DESTDIR)$(shell cups-config --serverbin 2>/dev/null)
 -CUPS_DEVEL := $(shell grep cupsSideChannelDoRequest /usr/include/cups/sidechannel.h 2>/dev/null)
-+CUPS_DEVEL := $(DESTDIR)$(shell grep cupsSideChannelDoRequest /usr/include/cups/sidechannel.h 2>/dev/null)
 -CUPS_GOODAPI := $(shell cups-config --api-version 2>/dev/null | sed "s/1\.[0123].*//")
-+CUPS_GOODAPI := $(DESTDIR)$(shell cups-config --api-version | sed "s/1\.[0123].*//" 2>/dev/null)
++CUPS_DEVEL := $(DESTDIR)$(shell grep cupsSideChannelDoRequest /usr/include/cups/sidechannel.h 2>/dev/null)
++CUPS_GOODAPI := $(DESTDIR)$(shell cups-config --api-version 2>/dev/null | sed "s/1\.[0123].*//")
++
  
  # hpclj2600n-0.icm km2430_0.icm km2430_1.icm km2430_2.icm samclp300-0.icm
  # sihp1000.img sihp1005.img sihp1020.img sihp1018.img
- # sihpP1005.img sihpP1006.img sihpP1505.img
-@@ -654,6 +657,8 @@ install-test:
- UDEVBIN=$(DESTDIR)/bin/
- 
- install-prog:
-+	[ -d $(BIN) ] || $(INSTALL) -d -m 755 $(BIN)/
-+	[ -d $(DESTDIR)/usr/bin/ ] || $(INSTALL) -d -m 755 $(DESTDIR)/usr/bin/
- 	#
- 	# Install driver, wrapper, and development tools
- 	#
-@@ -661,7 +658,7 @@ install-prog:
+@@ -652,7 +653,7 @@
  	$(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/
  	if [ "$(BINPROGS)" != "" ]; then \
  	    $(INSTALL) -d $(UDEVBIN); \
@@ -49,7 +30,7 @@ Subject: [PATCH] Destdir support
  	fi
  	#
  	# Install gamma correction files.  These are just templates,
-@@ -715,10 +722,10 @@ install-foo:
+@@ -706,10 +707,10 @@
  	#
  	# Clear foomatic cache and rebuild database if needed
  	#
@@ -64,34 +45,29 @@ Subject: [PATCH] Destdir support
  	    foomatic-combo-xml -O >overview.xml; \
  	fi
  
-@@ -847,10 +854,10 @@ install-extra:
- 	    fi; \
+@@ -839,7 +840,7 @@
  	done
  
--MODEL=$(DESTDIR)/usr/share/cups/model
-+MODEL=$(PREFIX)/share/cups/model
+ MODEL=$(PREFIX)/share/cups/model
 -LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model
 +LOCALMODEL=$(PREFIX)/usr/local/share/cups/model
  MACMODEL=/Library/Printers/PPDs/Contents/Resources
--PPD=$(DESTDIR)/usr/share/ppd
-+PPD=$(PREFIX)/share/ppd
+ PPD=$(PREFIX)/share/ppd
  VARPPD=/var/lp/ppd
- install-ppd:
- 	#
-@@ -908,9 +908,9 @@ install-ppd:
+@@ -899,9 +900,9 @@
  	    done; \
  	fi
  
 -APPL=$(DESTDIR)/usr/share/applications
 -OLDAPPL=$(DESTDIR)/usr/share/gnome/apps/System
 -PIXMAPS=$(DESTDIR)/usr/share/pixmaps
-+APPL=$(PREFIX)/share/applications
-+OLDAPPL=$(PREFIX)/share/gnome/apps/System
-+PIXMAPS=$(PREFIX)/share/pixmaps
++APPL=$(PREFIX)/usr/share/applications
++OLDAPPL=$(PREFIX)/usr/share/gnome/apps/System
++PIXMAPS=$(PREFIX)/usr/share/pixmaps
  
  install-desktop:
  	#
-@@ -934,7 +934,7 @@ install-gui:
+@@ -925,7 +926,7 @@
  	$(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS)