From 5bcbe0d10232add012408c99891518ac84014e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= <jpopelka@fedoraproject.org>
Date: Wed, 24 Feb 2010 11:10:48 +0000
Subject: [PATCH] - 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.patch => cups-str3285_v2-str3503.patch |  2 +-
 cups.spec                                              | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)
 rename cups-str3285_v2.patch => cups-str3285_v2-str3503.patch (85%)

diff --git a/cups-str3285_v2.patch b/cups-str3285_v2-str3503.patch
similarity index 85%
rename from cups-str3285_v2.patch
rename to cups-str3285_v2-str3503.patch
index d447e68..35b6002 100644
--- a/cups-str3285_v2.patch
+++ b/cups-str3285_v2-str3503.patch
@@ -6,7 +6,7 @@ diff -up cups-1.4.1/cups/dest.c.str3285 cups-1.4.1/cups/dest.c
    if (!cups_get_sdests(http, op, name, 0, &dest))
    {
 -    if (op == CUPS_GET_DEFAULT)
-+    if (op == CUPS_GET_DEFAULT || name)
++    if (op == CUPS_GET_DEFAULT || (name && !set_as_default))
        return (NULL);
  
     /*
diff --git a/cups.spec b/cups.spec
index 0718fe3..91d33ed 100644
--- a/cups.spec
+++ b/cups.spec
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -50,7 +50,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
@@ -234,7 +234,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
@@ -560,6 +560,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Feb 24 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.2-26
+- 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@redhat.com> - 1:1.4.2-25
 - Update classes.conf when a class member printer is deleted
   (bug #565878, STR #3505).