rpms/system-config-printer/devel system-config-printer-hplip-hack.patch, NONE, 1.1 system-config-printer.spec, 1.279, 1.280

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31534

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-hplip-hack.patch 
Log Message:
* Fri Aug 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-4
- Compare MFG and MDL fields case insensitively when adding automatic
  queues, because HPLIP provides them with different case than the
  actual devices do.  Upstream HPLIP bug:
  https://bugs.launchpad.net/hplip/+bug/405804


system-config-printer-hplip-hack.patch:
 udev-configure-printer.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE system-config-printer-hplip-hack.patch ---
diff -up system-config-printer-1.1.11/udev/udev-configure-printer.c.hplip-hack system-config-printer-1.1.11/udev/udev-configure-printer.c
--- system-config-printer-1.1.11/udev/udev-configure-printer.c.hplip-hack	2009-08-07 17:42:55.000000000 +0100
+++ system-config-printer-1.1.11/udev/udev-configure-printer.c	2009-08-14 15:50:32.302334316 +0100
@@ -791,8 +791,8 @@ find_matching_device_uris (struct device
 
       /* Now check the manufacturer and model names. */
       if (device_uri && this_id.mfg && this_id.mdl &&
-	  !strcmp (this_id.mfg, id->mfg) &&
-	  !strcmp (this_id.mdl, id->mdl))
+	  !strcasecmp (this_id.mfg, id->mfg) &&
+	  !strcasecmp (this_id.mdl, id->mdl))
 	{
 	  /* We've checked everything except the serial numbers.  This
 	   * is more complicated.  Some devices include a serial


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- system-config-printer.spec	14 Aug 2009 14:18:40 -0000	1.279
+++ system-config-printer.spec	14 Aug 2009 15:03:14 -0000	1.280
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.11
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,7 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 Patch1: system-config-printer-getdevices.patch
+Patch2: system-config-printer-hplip-hack.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -76,6 +77,7 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .getdevices
+%patch2 -p1 -b .hplip-hack
 
 %build
 %configure --with-udev-rules
@@ -188,6 +190,12 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Aug 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-4
+- Compare MFG and MDL fields case insensitively when adding automatic
+  queues, because HPLIP provides them with different case than the
+  actual devices do.  Upstream HPLIP bug:
+  https://bugs.launchpad.net/hplip/+bug/405804
+
 * Fri Aug 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.11-3
 - Own /var/run/udev-configure-printer.