diff --git a/cups-str3285.patch b/cups-str3285.patch new file mode 100644 index 0000000..05cc5f9 --- /dev/null +++ b/cups-str3285.patch @@ -0,0 +1,21 @@ +diff -up cups-1.4rc1/cups/dest.c.str3285 cups-1.4rc1/cups/dest.c +--- cups-1.4rc1/cups/dest.c.str3285 2009-08-10 11:32:08.397714492 +0100 ++++ cups-1.4rc1/cups/dest.c 2009-08-10 11:32:14.143839210 +0100 +@@ -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 != NULL) + return (NULL); + + /* +@@ -557,7 +557,7 @@ cupsGetNamedDest(http_t *http, /* I + * configuration file does not exist. Find out the real default. + */ + +- if (!cups_get_sdests(http, CUPS_GET_DEFAULT, name, 0, &dest)) ++ if (!cups_get_sdests(http, CUPS_GET_DEFAULT, NULL, 0, &dest)) + return (NULL); + } + diff --git a/cups.spec b/cups.spec index b1a4bb5..227224c 100644 --- a/cups.spec +++ b/cups.spec @@ -64,6 +64,7 @@ Patch36: cups-str3272.patch Patch37: cups-avahi.patch Patch38: cups-str3277.patch Patch39: cups-str3284.patch +Patch40: cups-str3285.patch Patch100: cups-lspp.patch Epoch: 1 Url: http://www.cups.org/ @@ -228,6 +229,7 @@ module. %patch37 -p1 -b .avahi %patch38 -p1 -b .str3277 %patch39 -p1 -b .str3284 +%patch40 -p1 -b .str3285 %if %lspp %patch100 -p1 -b .lspp @@ -523,6 +525,8 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Aug 10 2009 Tim Waugh 1:1.4-0.rc1.14 +- Fixed cupsGetNamedDest() so it does not fall back to the default + printer when a destination has been named (bug #516439, STR #3285). - Fixed MIME type rules for image/jpeg and image/x-bitmap (bug #516438, STR #3284). - Clear out cache files on upgrade.