rpms/cups/devel cups-foomatic-recommended.patch, NONE, 1.1 cups.spec, 1.363, 1.364

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-foomatic-recommended.patch 
Log Message:
* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-3
- Don't strip foomatic recommended strings from make/model names.


cups-foomatic-recommended.patch:

--- NEW FILE cups-foomatic-recommended.patch ---
diff -up cups-1.3.2/scheduler/cups-driverd.c.foomatic-recommended cups-1.3.2/scheduler/cups-driverd.c
--- cups-1.3.2/scheduler/cups-driverd.c.foomatic-recommended	2007-09-25 10:33:29.000000000 +0100
+++ cups-1.3.2/scheduler/cups-driverd.c	2007-09-25 10:34:03.000000000 +0100
@@ -180,7 +180,6 @@ add_ppd(const char *name,		/* I - PPD na
 	int        type)		/* I - Driver type */
 {
   ppd_info_t	*ppd;			/* PPD */
-  char		*recommended;		/* Foomatic driver string */
 
 
  /*
@@ -238,15 +237,6 @@ add_ppd(const char *name,		/* I - PPD na
   strlcpy(ppd->record.device_id, device_id, sizeof(ppd->record.device_id));
 
  /*
-  * Strip confusing (and often wrong) "recommended" suffix added by
-  * Foomatic drivers...
-  */
-
-  if ((recommended = strstr(ppd->record.make_and_model,
-                            " (recommended)")) != NULL)
-    *recommended = '\0';
-
- /*
   * Return the new PPD pointer...
   */
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- cups.spec	21 Sep 2007 12:48:18 -0000	1.363
+++ cups.spec	25 Sep 2007 10:24:22 -0000	1.364
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -40,6 +40,7 @@
 Patch14: cups-lpr-help.patch
 Patch15: cups-str2512.patch
 Patch16: cups-pid.patch
+Patch17: cups-foomatic-recommended.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
@@ -150,6 +151,7 @@
 %patch14 -p1 -b .lpr-help
 %patch15 -p1 -b .str2512
 %patch16 -p1 -b .pid
+%patch17 -p1 -b .foomatic-recommended
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
@@ -445,6 +447,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Sep 25 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-3
+- Don't strip foomatic recommended strings from make/model names.
+
 * Fri Sep 21 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.2-2
 - Write printcap when remote printers have timed out (bug #290831).