rpms/cups/devel cups-autodetected-tag.patch, NONE, 1.1 cups.spec, 1.129, 1.130

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25132

Modified Files:
	cups.spec 
Added Files:
	cups-autodetected-tag.patch 
Log Message:
* Tue Jan 17 2006 Tim Waugh <twaugh at redhat.com> 1:1.1.23-30
- Include 'Autodetected' tag for better integration with autodetection tools.


cups-autodetected-tag.patch:
 printers.c |   11 +++++++++++
 printers.h |    1 +
 2 files changed, 12 insertions(+)

--- NEW FILE cups-autodetected-tag.patch ---
--- cups-1.1.23/scheduler/printers.c.autodetected-tag	2006-01-17 11:37:52.000000000 +0000
+++ cups-1.1.23/scheduler/printers.c	2006-01-17 11:45:18.000000000 +0000
@@ -1004,6 +1004,13 @@
       p->page_limit = atoi(value);
     else if (strcmp(name, "KLimit") == 0)
       p->k_limit = atoi(value);
+    else if (strcmp(name, "Autodetected") == 0)
+    {
+      if (strcasecmp(value, "yes") == 0)
+        p->autodetected = 1;
+      else
+        p->autodetected = 0;
+    }
     else
     {
      /*
@@ -1127,6 +1134,10 @@
     cupsFilePrintf(fp, "QuotaPeriod %d\n", printer->quota_period);
     cupsFilePrintf(fp, "PageLimit %d\n", printer->page_limit);
     cupsFilePrintf(fp, "KLimit %d\n", printer->k_limit);
+    if (printer->autodetected)
+      cupsFilePrintf(fp, "Autodetected Yes\n");
+    else
+      cupsFilePrintf(fp, "Autodetected No\n");
 
     for (i = 0; i < printer->num_users; i ++)
       cupsFilePrintf(fp, "%sUser %s\n", printer->deny_users ? "Deny" : "Allow",
--- cups-1.1.23/scheduler/printers.h.autodetected-tag	2006-01-17 11:45:47.000000000 +0000
+++ cups-1.1.23/scheduler/printers.h	2006-01-17 11:54:28.000000000 +0000
@@ -76,6 +76,7 @@
   int		num_history;		/* Number of history collections */
   ipp_t		**history;		/* History data */
   int		sequence_number;	/* Increasing sequence number */
+  int		autodetected;		/* Autodetected marker */
 } printer_t;
 
 


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- cups.spec	10 Jan 2006 17:54:41 -0000	1.129
+++ cups.spec	17 Jan 2006 11:56:14 -0000	1.130
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.1.23
-Release: 29
+Release: 30
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2
@@ -43,6 +43,7 @@
 Patch20: cups-gcc4.patch
 Patch21: cups-slow.patch
 Patch22: cups-dest-cache-v2.patch
+Patch23: cups-autodetected-tag.patch
 Patch24: cups-maxlogsize.patch
 Patch25: cups-enabledisable.patch
 Patch28: cups-no-propagate-ipp-port.patch
@@ -150,6 +151,7 @@
 %patch20 -p1 -b .gcc4
 %patch21 -p1 -b .slow
 %patch22 -p1 -b .dest-cache-v2
+%patch23 -p1 -b .autodetected-tag
 %patch24 -p1 -b .maxlogsize
 %patch25 -p1 -b .enabledisable
 %patch28 -p1 -b .no-propagate-ipp-port
@@ -431,6 +433,9 @@
 %{_libdir}/cups/daemon/cups-lpd
 
 %changelog
+* Tue Jan 17 2006 Tim Waugh <twaugh at redhat.com> 1:1.1.23-30
+- Include 'Autodetected' tag for better integration with autodetection tools.
+
 * Tue Jan 10 2006 Tim Waugh <twaugh at redhat.com> 1:1.1.23-29
 - Apply dest-cache-v2 patch (bug #175847).