SOURCES: foo2zjs-hplj1000.patch (NEW), foo2zjs-make.patch (NEW), f...

[beorn]

Author: beorn                        Date: Thu Mar  8 17:02:21 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- Patches for foo2zjs.spec by Kamil Jakubowski <jakubowski.kamil at 3vnet.pl>

---- Files affected:
SOURCES:
   foo2zjs-hplj1000.patch (NONE -> 1.1)  (NEW), foo2zjs-make.patch (NONE -> 1.1)  (NEW), foo2zjs-udev-rules.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/foo2zjs-hplj1000.patch
diff -u /dev/null SOURCES/foo2zjs-hplj1000.patch:1.1
--- /dev/null	Thu Mar  8 18:02:21 2007
+++ SOURCES/foo2zjs-hplj1000.patch	Thu Mar  8 18:02:16 2007
@@ -0,0 +1,63 @@
+--- hplj1000.orig	2007-03-06 23:00:06.000000000 +0000
++++ hplj1000	2007-03-06 22:14:44.000000000 +0000
+@@ -40,7 +40,7 @@
+ #
+ # Program used to determine USB id information
+ #
+-USBID=/bin/usb_printerid
++USBID=/usr/bin/usb_printerid
+ 
+ #
+ #	Figure out how to log our messages
+@@ -65,7 +65,7 @@
+ #
+ #	Figure out the model number from the name of this script
+ #
+-case "$0" in
++case "$1" in
+ *1000)
+     MODEL=1000
+     USB1=0x03f0	#Vendor
+@@ -91,42 +91,6 @@
+     exit
+     ;;
+ esac
+-
+-#
+-#	The special command line argument "install-usermap" will install
+-#	the proper entry into the /etc/hotplug/usb.usermap file
+-#
+-case "$1" in
+-install-usermap)
+-    if [ "$USB2" != "" ]; then
+-	if [ -w /etc/hotplug/usb.usermap ]; then
+-		USERMAP=/etc/hotplug/usb.usermap
+-	elif [ -d /etc/hotplug/usb/ ]; then
+-		USERMAP=/etc/hotplug/usb/foo2zjs.usermap
+-		if [ ! -s $USERMAP ]; then
+-			echo > $USERMAP
+-		fi
+-	else
+-		log "No /etc/hotplug usermap!"
+-		exit
+-	fi
+-	chmod 664 $USERMAP
+-	ex - $USERMAP <<-EOF
+-	g/^hplj$MODEL/d
+-	\$a
+-	hplj$MODEL 0x0003 $USB1 $USB2 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+-	.
+-	w
+-	q
+-	EOF
+-    else
+-	log "I don't know the USB info for this model yet.  Please run"
+-	log "usb_printerid on the usb device and send the output to:"
+-	log "rick.richardson at comcast.net"
+-    fi
+-    exit 0
+-    ;;
+-esac
+  
+ #
+ #	Procedure to load a single device with firmware

================================================================
Index: SOURCES/foo2zjs-make.patch
diff -u /dev/null SOURCES/foo2zjs-make.patch:1.1
--- /dev/null	Thu Mar  8 18:02:21 2007
+++ SOURCES/foo2zjs-make.patch	Thu Mar  8 18:02:16 2007
@@ -0,0 +1,11 @@
+--- Makefile.orig	2007-02-20 13:12:48.000000000 +0000
++++ Makefile	2007-03-06 22:01:00.000000000 +0000
+@@ -398,7 +398,7 @@
+ 	#
+ 	install -c $(PROGS) $(SHELLS) $(BIN)/
+ 	if [ "$(BINPROGS)" != "" ]; then \
+-	    install -c $(BINPROGS) /bin/; \
++	    install -c $(BINPROGS) $(BIN)/ ; \
+ 	fi
+ 	#
+ 	# Install gamma correction files.  These are just templates,

================================================================
Index: SOURCES/foo2zjs-udev-rules.patch
diff -u /dev/null SOURCES/foo2zjs-udev-rules.patch:1.1
--- /dev/null	Thu Mar  8 18:02:21 2007
+++ SOURCES/foo2zjs-udev-rules.patch	Thu Mar  8 18:02:16 2007
@@ -0,0 +1,15 @@
+--- hplj10xx.rules.orig	2007-01-25 15:49:10.000000000 +0000
++++ hplj10xx.rules	2007-03-06 22:31:55.000000000 +0000
+@@ -1,8 +1,8 @@
+ #Own udev rule for HP Laserjet 1000
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="hp LaserJet 1000", NAME="usb/%k", SYMLINK+="hplj1000%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1000" 
++KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="hp LaserJet 1000", NAME="usb/%k", SYMLINK+="hplj1000%e", MODE="0666", RUN+="/usr/bin/hplj10xx hplj1000" 
+ #Own udev rule for HP Laserjet 1005
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="hp LaserJet 1005 series", NAME="usb/%k", SYMLINK+="hplj1005%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005" 
++KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="hp LaserJet 1005 series", NAME="usb/%k", SYMLINK+="hplj1005%e", MODE="0666", RUN+="/usr/bin/hplj10xx hplj1005" 
+ #Own udev rule for HP Laserjet 1018
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="HP LaserJet 1018", NAME="usb/%k", SYMLINK+="hplj1018%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018" 
++KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="HP LaserJet 1018", NAME="usb/%k", SYMLINK+="hplj1018%e", MODE="0666", RUN+="/usr/bin/hplj10xx hplj1018" 
+ #Own udev rule for HP Laserjet 1020
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="HP LaserJet 1020", NAME="usb/%k", SYMLINK+="hplj1020%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020" 
++KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="HP LaserJet 1020", NAME="usb/%k", SYMLINK+="hplj1020%e", MODE="0666", RUN+="/usr/bin/hplj10xx  hplj1020" 
================================================================