rpms/hal-cups-utils/devel hal-cups-utils-description.patch, NONE, 1.1 hal-cups-utils.spec, 1.59, 1.60

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hal-cups-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22848

Modified Files:
	hal-cups-utils.spec 
Added Files:
	hal-cups-utils-description.patch 
Log Message:
* Mon Aug  6 2007 Tim Waugh <twaugh at redhat.com> 0.6.12-2
- Don't use IEEE 1284 DES field for device description: make/model strings
  are better.


hal-cups-utils-description.patch:

--- NEW FILE hal-cups-utils-description.patch ---
--- hal-cups-utils-0.6.12/backend/hal.c.description	2007-08-03 17:07:03.000000000 +0100
+++ hal-cups-utils-0.6.12/backend/hal.c	2007-08-06 14:14:32.000000000 +0100
@@ -196,8 +196,7 @@
 		}
 
 		printf ("direct hal://%s \"%s\" \"%s\" \"%s\"\n",
-			printer_list[i], make_model,
-			description != NULL ? description : make_model,
+			printer_list[i], make_model, make_model,
 			deviceid);
 	}
 
--- hal-cups-utils-0.6.12/ChangeLog.description	2007-08-03 17:07:04.000000000 +0100
+++ hal-cups-utils-0.6.12/ChangeLog	2007-08-06 14:14:32.000000000 +0100
@@ -0,0 +1,7 @@
+2007-08-06  Tim Waugh  <twaugh at redhat.com>
+
+	* backend/hal.c (list_devices): Use make/model strings instead of
+	the description string for identifying the device.  Many devices,
+	including the HP Photosmart A717, provide useless device
+	description fields in the IEEE 1284 ID.
+


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- hal-cups-utils.spec	3 Aug 2007 16:12:46 -0000	1.59
+++ hal-cups-utils.spec	6 Aug 2007 13:25:08 -0000	1.60
@@ -1,11 +1,12 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
 Version: 0.6.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
 Source1: cups-config-daemon
+Patch0: hal-cups-utils-description.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel
 BuildRequires: dbus-devel >= 0.60
@@ -27,6 +28,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q
+%patch0 -p1 -b .description
 
 %build
 
@@ -58,6 +60,10 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Mon Aug  6 2007 Tim Waugh <twaugh at redhat.com> 0.6.12-2
+- Don't use IEEE 1284 DES field for device description: make/model strings
+  are better.
+
 * Fri Aug  3 2007 Tim Waugh <twaugh at redhat.com> 0.6.12-1
 - 0.6.12:
   - Improvements from Till Kamppeter: