diff --git a/cups-str3285_v2.patch b/cups-str3285_v2.patch new file mode 100644 index 0000000..d447e68 --- /dev/null +++ b/cups-str3285_v2.patch @@ -0,0 +1,12 @@ +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) + return (NULL); + + /* diff --git a/cups-str3390.patch b/cups-str3390.patch new file mode 100644 index 0000000..a9d958d --- /dev/null +++ b/cups-str3390.patch @@ -0,0 +1,15 @@ +diff -up cups-1.4.1/cgi-bin/admin.c.str3390 cups-1.4.1/cgi-bin/admin.c +--- cups-1.4.1/cgi-bin/admin.c.str3390 2009-08-29 08:05:14.000000000 +0200 ++++ cups-1.4.1/cgi-bin/admin.c 2009-10-27 14:44:53.000000000 +0100 +@@ -1044,6 +1044,11 @@ do_am_printer(http_t *http, /* I - HTTP + if ((attr = ippFindAttribute(oldinfo, "printer-location", + IPP_TAG_TEXT)) != NULL) + cgiSetVariable("PRINTER_LOCATION", attr->values[0].string.text); ++ ++ if ((attr = ippFindAttribute(oldinfo, "printer-is-shared", ++ IPP_TAG_BOOLEAN)) != NULL) ++ cgiSetVariable("PRINTER_IS_SHARED", ++ attr->values[0].boolean ? "1" : "0"); + } + + cgiCopyTemplateLang("modify-printer.tmpl"); diff --git a/cups-str3391.patch b/cups-str3391.patch new file mode 100644 index 0000000..4e6cc7b --- /dev/null +++ b/cups-str3391.patch @@ -0,0 +1,196 @@ +diff -up cups-1.4.1/templates/add-printer.tmpl.str3391 cups-1.4.1/templates/add-printer.tmpl +--- cups-1.4.1/templates/add-printer.tmpl.str3391 2009-06-18 19:23:21.000000000 +0200 ++++ cups-1.4.1/templates/add-printer.tmpl 2009-10-27 15:08:45.000000000 +0100 +@@ -4,6 +4,10 @@ + +
+ ++ ++ ++ ++ + {?current_make!?:} + {?current_make_and_model!?:} + +diff -up cups-1.4.1/templates/de/add-printer.tmpl.str3391 cups-1.4.1/templates/de/add-printer.tmpl +--- cups-1.4.1/templates/de/add-printer.tmpl.str3391 2009-06-18 19:23:21.000000000 +0200 ++++ cups-1.4.1/templates/de/add-printer.tmpl 2009-10-27 15:08:56.000000000 +0100 +@@ -4,6 +4,10 @@ + + + ++ ++ ++ ++ + {?current_make!?:} + {?current_make_and_model!?:} + +diff -up cups-1.4.1/templates/de/modify-printer.tmpl.str3391 cups-1.4.1/templates/de/modify-printer.tmpl +--- cups-1.4.1/templates/de/modify-printer.tmpl.str3391 2009-06-18 19:23:21.000000000 +0200 ++++ cups-1.4.1/templates/de/modify-printer.tmpl 2009-10-27 15:10:28.000000000 +0100 +@@ -4,6 +4,10 @@ + + + ++ ++ ++ ++ + + + +diff -up cups-1.4.1/templates/es/add-printer.tmpl.str3391 cups-1.4.1/templates/es/add-printer.tmpl +--- cups-1.4.1/templates/es/add-printer.tmpl.str3391 2009-06-18 19:23:21.000000000 +0200 ++++ cups-1.4.1/templates/es/add-printer.tmpl 2009-10-27 15:09:02.000000000 +0100 +@@ -4,6 +4,10 @@ + + + ++ ++ ++ ++ + {?current_make!?:} + {?current_make_and_model!?:} + +diff -up cups-1.4.1/templates/es/modify-printer.tmpl.str3391 cups-1.4.1/templates/es/modify-printer.tmpl +--- cups-1.4.1/templates/es/modify-printer.tmpl.str3391 2009-06-18 19:23:21.000000000 +0200 ++++ cups-1.4.1/templates/es/modify-printer.tmpl 2009-10-27 15:10:32.000000000 +0100 +@@ -4,6 +4,10 @@ + + + ++ ++ ++ ++ + + +
+diff -up cups-1.4.1/templates/eu/add-printer.tmpl.str3391 cups-1.4.1/templates/eu/add-printer.tmpl +--- cups-1.4.1/templates/eu/add-printer.tmpl.str3391 2009-07-07 18:52:34.000000000 +0200 ++++ cups-1.4.1/templates/eu/add-printer.tmpl 2009-10-27 15:09:08.000000000 +0100 +@@ -4,6 +4,10 @@ + + + ++ ++ ++ ++ + {?current_make!?:} + {?current_make_and_model!?:} + +diff -up cups-1.4.1/templates/eu/modify-printer.tmpl.str3391 cups-1.4.1/templates/eu/modify-printer.tmpl +--- cups-1.4.1/templates/eu/modify-printer.tmpl.str3391 2009-07-07 18:52:34.000000000 +0200 ++++ cups-1.4.1/templates/eu/modify-printer.tmpl 2009-10-27 15:10:37.000000000 +0100 +@@ -4,6 +4,10 @@ + + + ++ ++ ++ ++ + + +
+diff -up cups-1.4.1/templates/ja/add-printer.tmpl.str3391 cups-1.4.1/templates/ja/add-printer.tmpl +--- cups-1.4.1/templates/ja/add-printer.tmpl.str3391 2009-06-18 19:23:21.000000000 +0200 ++++ cups-1.4.1/templates/ja/add-printer.tmpl 2009-10-27 15:09:15.000000000 +0100 +@@ -4,6 +4,10 @@ + + + ++ ++ ++ ++ + {?current_make!?:} + {?current_make_and_model!?:} + +diff -up cups-1.4.1/templates/ja/modify-printer.tmpl.str3391 cups-1.4.1/templates/ja/modify-printer.tmpl +--- cups-1.4.1/templates/ja/modify-printer.tmpl.str3391 2009-06-18 19:23:21.000000000 +0200 ++++ cups-1.4.1/templates/ja/modify-printer.tmpl 2009-10-27 15:10:40.000000000 +0100 +@@ -4,6 +4,10 @@ + + + ++ ++ ++ ++ + + +
+diff -up cups-1.4.1/templates/modify-printer.tmpl.str3391 cups-1.4.1/templates/modify-printer.tmpl +--- cups-1.4.1/templates/modify-printer.tmpl.str3391 2009-06-18 19:23:21.000000000 +0200 ++++ cups-1.4.1/templates/modify-printer.tmpl 2009-10-27 15:10:23.000000000 +0100 +@@ -4,6 +4,10 @@ + + + ++ ++ ++ ++ + + +
+diff -up cups-1.4.1/templates/pl/add-printer.tmpl.str3391 cups-1.4.1/templates/pl/add-printer.tmpl +--- cups-1.4.1/templates/pl/add-printer.tmpl.str3391 2009-06-18 19:23:21.000000000 +0200 ++++ cups-1.4.1/templates/pl/add-printer.tmpl 2009-10-27 15:09:20.000000000 +0100 +@@ -4,6 +4,10 @@ + + + ++ ++ ++ ++ + {?current_make!?:} + {?current_make_and_model!?:} + +diff -up cups-1.4.1/templates/pl/modify-printer.tmpl.str3391 cups-1.4.1/templates/pl/modify-printer.tmpl +--- cups-1.4.1/templates/pl/modify-printer.tmpl.str3391 2009-06-18 19:23:21.000000000 +0200 ++++ cups-1.4.1/templates/pl/modify-printer.tmpl 2009-10-27 15:10:44.000000000 +0100 +@@ -4,6 +4,10 @@ + + + ++ ++ ++ ++ + + +
+diff -up cups-1.4.1/templates/ru/add-printer.tmpl.str3391 cups-1.4.1/templates/ru/add-printer.tmpl +--- cups-1.4.1/templates/ru/add-printer.tmpl.str3391 2009-06-18 19:23:21.000000000 +0200 ++++ cups-1.4.1/templates/ru/add-printer.tmpl 2009-10-27 15:09:24.000000000 +0100 +@@ -4,6 +4,10 @@ + + + ++ ++ ++ ++ + {?current_make!?:} + {?current_make_and_model!?:} + +diff -up cups-1.4.1/templates/ru/modify-printer.tmpl.str3391 cups-1.4.1/templates/ru/modify-printer.tmpl +--- cups-1.4.1/templates/ru/modify-printer.tmpl.str3391 2009-06-18 19:23:21.000000000 +0200 ++++ cups-1.4.1/templates/ru/modify-printer.tmpl 2009-10-27 15:10:48.000000000 +0100 +@@ -4,6 +4,10 @@ + + + ++ ++ ++ ++ + + +
diff --git a/cups-str3396.patch b/cups-str3396.patch new file mode 100644 index 0000000..d49a3b2 --- /dev/null +++ b/cups-str3396.patch @@ -0,0 +1,11 @@ +diff -up cups-1.4.1/templates/de/set-printer-options-header.tmpl.str3396 cups-1.4.1/templates/de/set-printer-options-header.tmpl +--- cups-1.4.1/templates/de/set-printer-options-header.tmpl.str3396 2009-04-03 17:55:28.000000000 +0200 ++++ cups-1.4.1/templates/de/set-printer-options-header.tmpl 2009-10-27 15:17:53.000000000 +0100 +@@ -1,6 +1,6 @@ +
+ +-

Standardeinstellungen f%uuml;r {printer_name} festlegen

++

Standardeinstellungen für {printer_name} festlegen

+ + + diff --git a/cups.spec b/cups.spec index 258b9a5..b8addfa 100644 --- a/cups.spec +++ b/cups.spec @@ -9,7 +9,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.4.1 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 Group: System Environment/Daemons Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2 @@ -55,6 +55,11 @@ Patch37: cups-avahi.patch Patch38: cups-str3332.patch Patch39: cups-str3356.patch Patch40: cups-str3382.patch +Patch41: cups-str3285_v2.patch +Patch42: cups-str3390.patch +Patch43: cups-str3391.patch +Patch44: cups-str3396.patch + Patch100: cups-lspp.patch Epoch: 1 Url: http://www.cups.org/ @@ -216,6 +221,10 @@ gzip -n postscript.ppd %patch38 -p1 -b .str3332 %patch39 -p1 -b .str3356 %patch40 -p1 -b .str3382 +%patch41 -p1 -b .str3285_v2 +%patch42 -p1 -b .str3390 +%patch43 -p1 -b .str3391 +%patch44 -p1 -b .str3396 %if %lspp %patch100 -p1 -b .lspp @@ -511,6 +520,12 @@ rm -rf $RPM_BUILD_ROOT %{php_extdir}/phpcups.so %changelog +* Tue Oct 27 2009 Jiri Popelka 1:1.4.1-13 +- Fix incorrectly applied patch from #STR3285 (bug #531108). +- Set the PRINTER_IS_SHARED variable for admin.cgi (bug #529634, #STR3390). +- Pass through serial parameters correctly in web interface (bug #529635, #STR3391). +- Fixed German translation (bug #531144, #STR3396). + * Tue Oct 20 2009 Jiri Popelka 1:1.4.1-12 - Fix cups-lpd to create unique temporary data files (bug #529838).