rpms/cups/devel cups-str3244.patch,NONE,1.1 cups.spec,1.480,1.481

[Tim Waugh]

Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str3244.patch 
Log Message:
* Wed Jul  1 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.6
- Fixed lpadmin for remote 1.3.x servers (bug #506977, STR #3231).


cups-str3244.patch:

--- NEW FILE cups-str3244.patch ---
diff -up cups-1.4rc1/templates/de/option-boolean.tmpl.str3244 cups-1.4rc1/templates/de/option-boolean.tmpl
--- cups-1.4rc1/templates/de/option-boolean.tmpl.str3244	2009-04-03 16:55:28.000000000 +0100
+++ cups-1.4rc1/templates/de/option-boolean.tmpl	2009-07-01 14:07:00.333422971 +0100
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>
diff -up cups-1.4rc1/templates/de/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/de/option-pickmany.tmpl
--- cups-1.4rc1/templates/de/option-pickmany.tmpl.str3244	2009-04-03 16:55:28.000000000 +0100
+++ cups-1.4rc1/templates/de/option-pickmany.tmpl	2009-07-01 14:07:00.333422971 +0100
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>
diff -up cups-1.4rc1/templates/de/option-pickone.tmpl.str3244 cups-1.4rc1/templates/de/option-pickone.tmpl
--- cups-1.4rc1/templates/de/option-pickone.tmpl.str3244	2009-04-03 16:55:28.000000000 +0100
+++ cups-1.4rc1/templates/de/option-pickone.tmpl	2009-07-01 14:07:00.334423521 +0100
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>
diff -up cups-1.4rc1/templates/es/option-boolean.tmpl.str3244 cups-1.4rc1/templates/es/option-boolean.tmpl
--- cups-1.4rc1/templates/es/option-boolean.tmpl.str3244	2008-12-08 21:20:06.000000000 +0000
+++ cups-1.4rc1/templates/es/option-boolean.tmpl	2009-07-01 14:07:00.335423309 +0100
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>
diff -up cups-1.4rc1/templates/es/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/es/option-pickmany.tmpl
--- cups-1.4rc1/templates/es/option-pickmany.tmpl.str3244	2008-12-08 21:20:06.000000000 +0000
+++ cups-1.4rc1/templates/es/option-pickmany.tmpl	2009-07-01 14:07:00.335423309 +0100
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>
diff -up cups-1.4rc1/templates/es/option-pickone.tmpl.str3244 cups-1.4rc1/templates/es/option-pickone.tmpl
--- cups-1.4rc1/templates/es/option-pickone.tmpl.str3244	2008-12-08 21:20:06.000000000 +0000
+++ cups-1.4rc1/templates/es/option-pickone.tmpl	2009-07-01 14:07:00.336423193 +0100
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>
diff -up cups-1.4rc1/templates/ja/option-boolean.tmpl.str3244 cups-1.4rc1/templates/ja/option-boolean.tmpl
--- cups-1.4rc1/templates/ja/option-boolean.tmpl.str3244	2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ja/option-boolean.tmpl	2009-07-01 14:07:00.336423193 +0100
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>
diff -up cups-1.4rc1/templates/ja/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/ja/option-pickmany.tmpl
--- cups-1.4rc1/templates/ja/option-pickmany.tmpl.str3244	2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ja/option-pickmany.tmpl	2009-07-01 14:07:00.337423282 +0100
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>
diff -up cups-1.4rc1/templates/ja/option-pickone.tmpl.str3244 cups-1.4rc1/templates/ja/option-pickone.tmpl
--- cups-1.4rc1/templates/ja/option-pickone.tmpl.str3244	2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ja/option-pickone.tmpl	2009-07-01 14:07:00.337423282 +0100
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>
diff -up cups-1.4rc1/templates/option-boolean.tmpl.str3244 cups-1.4rc1/templates/option-boolean.tmpl
--- cups-1.4rc1/templates/option-boolean.tmpl.str3244	2008-10-04 16:34:08.000000000 +0100
+++ cups-1.4rc1/templates/option-boolean.tmpl	2009-07-01 14:07:00.338423040 +0100
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>
diff -up cups-1.4rc1/templates/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/option-pickmany.tmpl
--- cups-1.4rc1/templates/option-pickmany.tmpl.str3244	2008-10-04 16:34:08.000000000 +0100
+++ cups-1.4rc1/templates/option-pickmany.tmpl	2009-07-01 14:07:00.338423040 +0100
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>
diff -up cups-1.4rc1/templates/option-pickone.tmpl.str3244 cups-1.4rc1/templates/option-pickone.tmpl
--- cups-1.4rc1/templates/option-pickone.tmpl.str3244	2008-10-04 16:34:08.000000000 +0100
+++ cups-1.4rc1/templates/option-pickone.tmpl	2009-07-01 14:07:00.339298478 +0100
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>
diff -up cups-1.4rc1/templates/pl/option-boolean.tmpl.str3244 cups-1.4rc1/templates/pl/option-boolean.tmpl
--- cups-1.4rc1/templates/pl/option-boolean.tmpl.str3244	2009-02-25 16:48:35.000000000 +0000
+++ cups-1.4rc1/templates/pl/option-boolean.tmpl	2009-07-01 14:07:00.340298367 +0100
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>
diff -up cups-1.4rc1/templates/pl/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/pl/option-pickmany.tmpl
--- cups-1.4rc1/templates/pl/option-pickmany.tmpl.str3244	2009-02-25 16:48:35.000000000 +0000
+++ cups-1.4rc1/templates/pl/option-pickmany.tmpl	2009-07-01 14:07:00.340298367 +0100
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>
diff -up cups-1.4rc1/templates/pl/option-pickone.tmpl.str3244 cups-1.4rc1/templates/pl/option-pickone.tmpl
--- cups-1.4rc1/templates/pl/option-pickone.tmpl.str3244	2009-02-25 16:48:35.000000000 +0000
+++ cups-1.4rc1/templates/pl/option-pickone.tmpl	2009-07-01 14:07:00.344297815 +0100
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>
diff -up cups-1.4rc1/templates/ru/option-boolean.tmpl.str3244 cups-1.4rc1/templates/ru/option-boolean.tmpl
--- cups-1.4rc1/templates/ru/option-boolean.tmpl.str3244	2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ru/option-boolean.tmpl	2009-07-01 14:07:00.345423743 +0100
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD>
-{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice-1}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>
diff -up cups-1.4rc1/templates/ru/option-pickmany.tmpl.str3244 cups-1.4rc1/templates/ru/option-pickmany.tmpl
--- cups-1.4rc1/templates/ru/option-pickmany.tmpl.str3244	2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ru/option-pickmany.tmpl	2009-07-01 14:07:00.345423743 +0100
@@ -1,6 +1,6 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>
diff -up cups-1.4rc1/templates/ru/option-pickone.tmpl.str3244 cups-1.4rc1/templates/ru/option-pickone.tmpl
--- cups-1.4rc1/templates/ru/option-pickone.tmpl.str3244	2009-02-17 19:04:25.000000000 +0000
+++ cups-1.4rc1/templates/ru/option-pickone.tmpl	2009-07-01 14:07:00.346423150 +0100
@@ -1,7 +1,7 @@
 <TR>
 <TH {conflicted=1?CLASS="conflict":CLASS="label"} WIDTH="50%"><A NAME="{keyword}">{keytext}</A>:</TH>
 <TD><SELECT NAME="{keyword}" ID="select-{keyword}" ONCHANGE="update_paramtable('{keyword}')">
-{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+{[choices]<OPTION {choices={defchoice-1}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT>
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -p -r1.480 -r1.481
--- cups.spec	1 Jul 2009 11:28:25 -0000	1.480
+++ cups.spec	1 Jul 2009 13:13:02 -0000	1.481
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.6%{?dist}
+Release: 0.%{pre}.7%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -47,7 +47,8 @@ Patch23: cups-res_init.patch
 Patch24: cups-str3229.patch
 Patch25: cups-filter-debug.patch
 Patch26: cups-str3231.patch
-Patch27: cups-avahi.patch
+Patch27: cups-str3244.patch
+Patch28: cups-avahi.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -190,7 +191,8 @@ module. 
 %patch24 -p1 -b .str3229
 %patch25 -p1 -b .filter-debug
 %patch26 -p1 -b .str3231
-#%patch27 -p1 -b .avahi
+%patch27 -p1 -b .str3244
+#%patch28 -p1 -b .avahi
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -474,6 +476,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Wed Jul  1 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.7
+- Fixed template problem preventing current printer option defaults
+  from being shown in the web interface (bug #506794, STR #3244).
+
 * Wed Jul  1 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.6
 - Fixed lpadmin for remote 1.3.x servers (bug #506977, STR #3231).