rpms/cups/FC-5 cups-str1893.patch,NONE,1.1 cups.spec,1.203,1.204

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str1893.patch 
Log Message:
* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com>
- Apply patch to fix STR #1893 (bug #201800).


cups-str1893.patch:
 dirsvc.c |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE cups-str1893.patch ---
--- cups-1.2.x/scheduler/dirsvc.c.str1893	2006-08-11 16:59:00.000000000 +0100
+++ cups-1.2.x/scheduler/dirsvc.c	2006-08-11 17:55:12.000000000 +0100
@@ -1923,6 +1923,10 @@
     else
       return;
 
+    /* Restore full host name. */
+    if (hptr && *hptr == '\0')
+      *hptr = '.';
+
     if ((p = cupsdFindClass(name)) == NULL && BrowseShortNames)
     {
       if ((p = cupsdFindClass(resource + 9)) != NULL)
@@ -2026,6 +2030,10 @@
     else
       return;
 
+    /* Restore full host name. */
+    if (hptr && *hptr == '\0')
+      *hptr = '.';
+
     if ((p = cupsdFindPrinter(name)) == NULL && BrowseShortNames)
     {
       if ((p = cupsdFindPrinter(resource + 10)) != NULL)


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- cups.spec	6 Aug 2006 10:58:30 -0000	1.203
+++ cups.spec	11 Aug 2006 17:14:46 -0000	1.204
@@ -31,6 +31,7 @@
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
 Patch10: cups-1.1.17-ppdsdat.patch
+Patch11: cups-str1893.patch
 Patch12: cups-locale.patch
 Patch13: cups-CAN-2005-0064.patch
 Patch17: cups-serverbin-compat.patch
@@ -127,6 +128,7 @@
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
 %patch10 -p1 -b .ppdsdat
+%patch11 -p1 -b .str1893
 %patch12 -p1 -b .locale
 %patch13 -p1 -b .CAN-2005-0064
 %patch17 -p1 -b .serverbin-compat
@@ -404,6 +406,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Aug 11 2006 Tim Waugh <twaugh at redhat.com>
+- Apply patch to fix STR #1893 (bug #201800).
+
 * Sun Aug  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.5
 - Apply patch from STR #1881 for remote IPP printing (bug #201167).