packages: foo2zjs/foo2zjs-hplj1000.patch, foo2zjs/foo2zjs-udev-rules.patch, ...

arekm arekm at pld-linux.org
Wed Nov 30 13:48:20 CET 2011 

Author: arekm                        Date: Wed Nov 30 12:48:20 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 20111123

---- Files affected:
packages/foo2zjs:
   foo2zjs-hplj1000.patch (1.2 -> 1.3) , foo2zjs-udev-rules.patch (1.3 -> 1.4) , foo2zjs.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/foo2zjs/foo2zjs-hplj1000.patch
diff -u packages/foo2zjs/foo2zjs-hplj1000.patch:1.2 packages/foo2zjs/foo2zjs-hplj1000.patch:1.3
--- packages/foo2zjs/foo2zjs-hplj1000.patch:1.2	Wed Apr 23 15:57:07 2008
+++ packages/foo2zjs/foo2zjs-hplj1000.patch	Wed Nov 30 13:48:15 2011
@@ -1,28 +1,9 @@
---- hplj1000.orig	2007-03-06 23:00:06.000000000 +0000
-+++ hplj1000	2007-03-06 22:14:44.000000000 +0000
-@@ -47,7 +47,7 @@
- #    [snip]
- #    # Mount all other filesystems (except for NFS and /proc, which is already
- #
--PRINTERID=/bin/usb_printerid
-+PRINTERID=/usr/bin/usb_printerid
+--- foo2zjs/hplj1000~	2011-11-30 13:46:32.000000000 +0100
++++ foo2zjs/hplj1000	2011-11-30 13:47:15.427823974 +0100
+@@ -154,57 +154,6 @@
+ rm -f /etc/udev/rules.d/*hpmud*laserjet_${model}*
+ rm -f /etc/udev/rules.d/*hpmud_support.rules
  
- #
- #	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
- *P1005)
-     MODEL=P1005
-     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
@@ -57,7 +38,23 @@
 -    fi
 -    exit 0
 -    ;;
+-install-usblp)
+-    for f in /etc/modprobe.d/blacklist*; do
+-	if grep -s -q usblp $f; then
+-	    ed - $f <<-EOF
+-		g/^blacklist.*usblp/d
+-		w
+-		q
+-		EOF
+-	    #echo $f
+-	    /sbin/modprobe usblp
+-	fi
+-    done
+-    exit 0
+-    ;;
 -esac
-  
+- 
+-#
+ #	Procedures to load a single device with firmware
  #
- #	Procedure to load a single device with firmware
+ load_usblp() {

================================================================
Index: packages/foo2zjs/foo2zjs-udev-rules.patch
diff -u packages/foo2zjs/foo2zjs-udev-rules.patch:1.3 packages/foo2zjs/foo2zjs-udev-rules.patch:1.4
--- packages/foo2zjs/foo2zjs-udev-rules.patch:1.3	Fri Sep 26 20:01:38 2008
+++ packages/foo2zjs/foo2zjs-udev-rules.patch	Wed Nov 30 13:48:15 2011
@@ -1,49 +1,48 @@
-diff -uNr foo2zjs.old/hplj10xx.rules foo2zjs/hplj10xx.rules
---- foo2zjs.old/hplj10xx.rules	2008-09-26 19:55:07.000000000 +0200
-+++ foo2zjs/hplj10xx.rules	2008-09-26 19:56:10.000000000 +0200
-@@ -1,36 +1,36 @@
+--- foo2zjs/hplj10xx.rules~	2010-04-09 22:53:09.000000000 +0200
++++ foo2zjs/hplj10xx.rules	2011-11-30 13:46:06.806284740 +0100
+@@ -4,36 +4,36 @@
  #Own udev rule for HP Laserjet 1000
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- 	SYSFS{product}=="hp LaserJet 1000", NAME="usb/%k", \
+ KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+ 	ATTRS{product}=="hp LaserJet 1000", NAME="usb/%k", \
 -	SYMLINK+="hplj1000-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1000" 
 +	SYMLINK+="hplj1000-%n", MODE="0666", RUN+="/usr/bin/hplj1000" 
  #Own udev rule for HP Laserjet 1005
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- 	SYSFS{product}=="hp LaserJet 1005 series", NAME="usb/%k", \
+ KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+ 	ATTRS{product}=="hp LaserJet 1005 series", NAME="usb/%k", \
 -	SYMLINK+="hplj1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005" 
 +	SYMLINK+="hplj1005-%n", MODE="0666", RUN+="/usr/bin/hplj1005" 
  #Own udev rule for HP Laserjet 1018
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- 	SYSFS{product}=="HP LaserJet 1018", NAME="usb/%k", \
+ KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+ 	ATTRS{product}=="HP LaserJet 1018", NAME="usb/%k", \
 -	SYMLINK+="hplj1018-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018" 
 +	SYMLINK+="hplj1018-%n", MODE="0666", RUN+="/usr/bin/hplj1018" 
  #Own udev rule for HP Laserjet 1020
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- 	SYSFS{product}=="HP LaserJet 1020", NAME="usb/%k", \
+ KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+ 	ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \
 -	SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020" 
 +	SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/usr/bin/hplj1020" 
  #Own udev rule for HP Laserjet P1005
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- 	SYSFS{product}=="HP LaserJet P1005", NAME="usb/%k", \
+ KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+ 	ATTRS{product}=="HP LaserJet P1005", NAME="usb/%k", \
 -	SYMLINK+="hpljP1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1005" 
 +	SYMLINK+="hpljP1005-%n", MODE="0666", RUN+="/usr/bin/hpljP1005" 
  #Own udev rule for HP Laserjet P1006
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- 	SYSFS{product}=="HP LaserJet P1006", NAME="usb/%k", \
+ KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+ 	ATTRS{product}=="HP LaserJet P1006", NAME="usb/%k", \
 -	SYMLINK+="hpljP1006-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1006" 
 +	SYMLINK+="hpljP1006-%n", MODE="0666", RUN+="/usr/bin/hpljP1006" 
  #Own udev rule for HP Laserjet P1007
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- 	SYSFS{product}=="HP LaserJet P1007", NAME="usb/%k", \
+ KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+ 	ATTRS{product}=="HP LaserJet P1007", NAME="usb/%k", \
 -	SYMLINK+="hpljP1007-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1007" 
 +	SYMLINK+="hpljP1007-%n", MODE="0666", RUN+="/usr/bin/hpljP1007" 
  #Own udev rule for HP Laserjet P1008
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- 	SYSFS{product}=="HP LaserJet P1008", NAME="usb/%k", \
+ KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+ 	ATTRS{product}=="HP LaserJet P1008", NAME="usb/%k", \
 -	SYMLINK+="hpljP1008-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1008" 
 +	SYMLINK+="hpljP1008-%n", MODE="0666", RUN+="/usr/bin/hpljP1008" 
  #Own udev rule for HP Laserjet P1505
- KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
- 	SYSFS{product}=="HP LaserJet P1505", NAME="usb/%k", \
+ KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
+ 	ATTRS{product}=="HP LaserJet P1505", NAME="usb/%k", \
 -	SYMLINK+="hpljP1505-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1505" 
 +	SYMLINK+="hpljP1505-%n", MODE="0666", RUN+="/usr/bin/hpljP1505" 

================================================================
Index: packages/foo2zjs/foo2zjs.spec
diff -u packages/foo2zjs/foo2zjs.spec:1.10 packages/foo2zjs/foo2zjs.spec:1.11
--- packages/foo2zjs/foo2zjs.spec:1.10	Sun Oct 19 12:53:42 2008
+++ packages/foo2zjs/foo2zjs.spec	Wed Nov 30 13:48:15 2011
@@ -2,22 +2,22 @@
 Summary:	Linux printer driver for ZjStream protocol
 Summary(pl.UTF-8):	Linuksowy sterownik drukarek dla protokołu ZjStream
 Name:		foo2zjs
-Version:	20080926
+Version:	20111123
 Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://foo2zjs.rkkda.com/%{name}.tar.gz
-# Source0-md5:	23f9b9a412d0986fa9d04b243464610f
+# Source0-md5:	e75e2bad825b67984af5629f000ad3e8
 Source1:	http://foo2zjs.rkkda.com/firmware/sihp1000.tar.gz
-# Source1-md5:	4555cc56685d324b07855a5eed4b83fc
+# Source1-md5:	eb7f6e1edfec313e6ca23abd27a0d1c2
 Source2:	http://foo2zjs.rkkda.com/firmware/sihp1005.tar.gz
-# Source2-md5:	6ff073de4e796d0bb3d5178c0305927d
+# Source2-md5:	04f7bd2eec09131371e27403626f38b5
 Source3:        http://foo2zjs.rkkda.com/firmware/sihpP1006.tar.gz
-# Source3-md5:	bee0e8b61976af6ffc0976cdf9bc2ba4
+# Source3-md5:	df4b0b84c6feb0d45f64d7fc219895a5
 Source4:	http://foo2zjs.rkkda.com/firmware/sihp1018.tar.gz
-# Source4-md5:	7ae97677adcc7962a82993dc4e012469
+# Source4-md5:	bf61f2ce504b233f999bc358f5a79499
 Source5:	http://foo2zjs.rkkda.com/firmware/sihp1020.tar.gz
-# Source5-md5:	b84f2512061da68a165e1e10a2adf502
+# Source5-md5:	1d408fa44fb43f2f5f8c8f7eabcc70c6
 Patch0:		%{name}-udev-rules.patch
 Patch1:		%{name}-hplj1000.patch
 URL:		http://foo2zjs.rkkda.com/
@@ -91,12 +91,12 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 
 %build
 %{__make} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}"
+	CFLAGS="%{rpmcflags} %{rpmcppflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -156,6 +156,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2011/11/30 12:48:15  arekm
+- up to 20111123
+
 Revision 1.10  2008/10/19 10:53:42  blekot
 - added P1006
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/foo2zjs/foo2zjs-hplj1000.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/foo2zjs/foo2zjs-udev-rules.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/foo2zjs/foo2zjs.spec?r1=1.10&r2=1.11&f=u

More information about the pld-cvs-commit mailing list