rpms/hplip/devel hplip-udev-rules.patch, 1.6, 1.7 hplip-pstotiff-is-rubbish.patch, 1.1, 1.2 hplip.spec, 1.260, 1.261

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15420

Modified Files:
	hplip-pstotiff-is-rubbish.patch hplip.spec 
Added Files:
	hplip-udev-rules.patch 
Log Message:
* Mon Mar  1 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-2
- Removed SYSFS use in udev rules and actually made them work
  (bug #560754).
- Use a temporary file in pstotiff to allow gs random access.


hplip-udev-rules.patch:
 56-hpmud_support.rules |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Index: hplip-udev-rules.patch
===================================================================
RCS file: hplip-udev-rules.patch
diff -N hplip-udev-rules.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hplip-udev-rules.patch	1 Mar 2010 11:37:23 -0000	1.7
@@ -0,0 +1,17 @@
+diff -up hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.2/data/rules/56-hpmud_support.rules
+--- hplip-3.10.2/data/rules/56-hpmud_support.rules.udev-rules	2010-03-01 11:21:01.049740484 +0000
++++ hplip-3.10.2/data/rules/56-hpmud_support.rules	2010-03-01 11:21:07.288609454 +0000
+@@ -7,8 +7,9 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul
+ LABEL="pid_test"
+ 
+ # Check for LaserJet products (0x03f0xx17).
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
++ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes"
+ 
+-ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'"
++ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'"
+ 
+-LABEL="hpmud_rules_end"
+\ No newline at end of file
++LABEL="hpmud_rules_end"

hplip-pstotiff-is-rubbish.patch:
 pstotiff |   59 ++++++++++++++++-------------------------------------------
 1 file changed, 16 insertions(+), 43 deletions(-)

Index: hplip-pstotiff-is-rubbish.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-pstotiff-is-rubbish.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-pstotiff-is-rubbish.patch	26 Feb 2010 12:30:29 -0000	1.1
+++ hplip-pstotiff-is-rubbish.patch	1 Mar 2010 11:37:23 -0000	1.2
@@ -1,7 +1,7 @@
 diff -up hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.2/fax/filters/pstotiff
---- hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish	2010-02-26 12:05:42.883265245 +0000
-+++ hplip-3.10.2/fax/filters/pstotiff	2010-02-26 12:06:06.546266294 +0000
-@@ -1,43 +1,11 @@
+--- hplip-3.10.2/fax/filters/pstotiff.pstotiff-is-rubbish	2010-02-24 23:07:09.000000000 +0000
++++ hplip-3.10.2/fax/filters/pstotiff	2010-03-01 09:52:50.676611385 +0000
+@@ -1,43 +1,16 @@
 -#!/usr/bin/env python
 -
 -import os
@@ -52,7 +52,12 @@ diff -up hplip-3.10.2/fax/filters/pstoti
 +  IN="$6"
 +fi
 +
++TMPFILE=`mktemp /tmp/pstotiff.XXXXXX` || exit 1
 +gs -I/usr/share/cups/fonts -sDEVICE=tiffg4 -dNOPAUSE -dBATCH \
 +   -dSAFER -dPARANOIDSAFER \
 +   -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT \
-+   -sstdout=%stderr -sOutputFile=- "$IN"
++   -sstdout=%stderr -sOutputFile="$TMPFILE" "$IN"
++RET=$?
++cat "$TMPFILE"
++rm -f "$TMPFILE"
++exit $RET


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -p -r1.260 -r1.261
--- hplip.spec	26 Feb 2010 12:30:29 -0000	1.260
+++ hplip.spec	1 Mar 2010 11:37:23 -0000	1.261
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -19,6 +19,7 @@ Patch3: hplip-ui-optional.patch
 Patch4: hplip-no-asm.patch
 Patch5: hplip-device-ids.patch
 Patch6: hplip-mucks-with-spooldir.patch
+Patch7: hplip-udev-rules.patch
 Patch8: hplip-retry-open.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
@@ -134,6 +135,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # directly (bug #552572).
 %patch6 -p1 -b .mucks-with-spooldir
 
+# Removed SYSFS use in udev rules and actually made them work
+# (bug #560754).
+%patch7 -p1 -b .udev-rules
+
 # Retry when connecting to device fails (bug #532112).
 %patch8 -p1 -b .retry-open
 
@@ -362,6 +367,11 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Mon Mar  1 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-2
+- Removed SYSFS use in udev rules and actually made them work
+  (bug #560754).
+- Use a temporary file in pstotiff to allow gs random access.
+
 * Fri Feb 26 2010 Tim Waugh <twaugh at redhat.com> - 3.10.2-1
 - 3.10.2.  No longer need preferences-crash patch.
 - The pstotiff filter is rubbish so replace it (launchpad #528394).