rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fixed cupsGetNamedDest() so it falls back to the real default printer

Browse Source 
when a default from configuration file does not exist (bug #565569, STR
    #3503).
This commit is contained in:
Jiří Popelka 2010-02-24 11:10:48 +00:00
parent cc2070d9d2
commit 5bcbe0d102
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cups-str3285_v2.patch → cups-str3285_v2-str3503.patch
View File

@ -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 (!cups_get_sdests(http, op, name, 0, &dest))
{ {
- if (op == CUPS_GET_DEFAULT) - if (op == CUPS_GET_DEFAULT)
+ if (op == CUPS_GET_DEFAULT || name) + if (op == CUPS_GET_DEFAULT || (name && !set_as_default))
return (NULL); return (NULL);
/* /*

10
cups.spec
View File

@ -8,7 +8,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.2 Version: 1.4.2
Release: 25%{?dist} Release: 26%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 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 Patch24: cups-cups-get-classes.patch
Patch25: cups-avahi.patch Patch25: cups-avahi.patch
Patch26: cups-str3382.patch Patch26: cups-str3382.patch
Patch27: cups-str3285_v2.patch Patch27: cups-str3285_v2-str3503.patch
Patch28: cups-str3390.patch Patch28: cups-str3390.patch
Patch29: cups-str3391.patch Patch29: cups-str3391.patch
Patch30: cups-str3381.patch Patch30: cups-str3381.patch
@ -234,7 +234,7 @@ module.
%patch24 -p1 -b .cups-get-classes %patch24 -p1 -b .cups-get-classes
%patch25 -p1 -b .avahi %patch25 -p1 -b .avahi
%patch26 -p1 -b .str3382 %patch26 -p1 -b .str3382
%patch27 -p1 -b .str3285_v2 %patch27 -p1 -b .str3285_v2-str3503
%patch28 -p1 -b .str3390 %patch28 -p1 -b .str3390
%patch29 -p1 -b .str3391 %patch29 -p1 -b .str3391
%patch30 -p1 -b .str3381 %patch30 -p1 -b .str3381
@ -560,6 +560,10 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %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 * Tue Feb 23 2010 Tim Waugh <twaugh@redhat.com> - 1:1.4.2-25
- Update classes.conf when a class member printer is deleted - Update classes.conf when a class member printer is deleted
(bug #565878, STR #3505). (bug #565878, STR #3505).