rpms/cups/devel cups-str3285_v2-str3503.patch, NONE, 1.1 cups.spec, 1.583, 1.584 cups-str3285_v2.patch, 1.1, NONE

[Jiří Popelka]

Author: jpopelka

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8640

Modified Files:
	cups.spec 
Added Files:
	cups-str3285_v2-str3503.patch 
Removed Files:
	cups-str3285_v2.patch 
Log Message:
* Wed Feb 24 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.2-32
- Fixed cupsGetNamedDest() so it falls back to the real default
  printer when a default from configuration file does not exist (bug #565569, STR #3503).


cups-str3285_v2-str3503.patch:
 dest.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cups-str3285_v2-str3503.patch ---
diff -up cups-1.4.1/cups/dest.c.str3285 cups-1.4.1/cups/dest.c
--- cups-1.4.1/cups/dest.c.str3285	2009-10-27 12:50:04.560012076 +0000
+++ cups-1.4.1/cups/dest.c	2009-10-27 12:50:23.814012173 +0000
@@ -549,7 +549,7 @@ cupsGetNamedDest(http_t     *http,	/* I 
 
   if (!cups_get_sdests(http, op, name, 0, &dest))
   {
-    if (op == CUPS_GET_DEFAULT)
+    if (op == CUPS_GET_DEFAULT || (name && !set_as_default))
       return (NULL);
 
    /*


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -p -r1.583 -r1.584
--- cups.spec	23 Feb 2010 12:25:59 -0000	1.583
+++ cups.spec	24 Feb 2010 11:09:44 -0000	1.584
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -48,7 +48,7 @@ Patch23: cups-uri-compat.patch
 Patch24: cups-cups-get-classes.patch
 Patch25: cups-avahi.patch
 Patch26: cups-str3382.patch
-Patch27: cups-str3285_v2.patch
+Patch27: cups-str3285_v2-str3503.patch
 Patch28: cups-str3390.patch
 Patch29: cups-str3391.patch
 Patch30: cups-str3381.patch
@@ -238,7 +238,7 @@ module. 
 %patch24 -p1 -b .cups-get-classes
 %patch25 -p1 -b .avahi
 %patch26 -p1 -b .str3382
-%patch27 -p1 -b .str3285_v2
+%patch27 -p1 -b .str3285_v2-str3503
 %patch28 -p1 -b .str3390
 %patch29 -p1 -b .str3391
 %patch30 -p1 -b .str3381
@@ -556,6 +556,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Feb 24 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.2-32
+- Fixed cupsGetNamedDest() so it falls back to the real default
+  printer when a default from configuration file does not exist (bug #565569, STR #3503).
+
 * Tue Feb 23 2010 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-31
 - Update classes.conf when a class member printer is deleted
   (bug #565878, STR #3505).


--- cups-str3285_v2.patch DELETED ---