From 25f495c5b6b1c5d2887d5ebc8591c0dfa92fa9f9 Mon Sep 17 00:00:00 2001
From: Jiří Popelka <jpopelka@fedoraproject.org>
Date: Nov 20 2009 13:57:47 +0000
Subject: - Do not translate russian links showing completed jobs (bug #539354, STR

    #3422).

---

diff --git a/cups-str3422.patch b/cups-str3422.patch
new file mode 100644
index 0000000..a0ac1bf
--- /dev/null
+++ b/cups-str3422.patch
@@ -0,0 +1,22 @@
+diff -up cups-1.4.2/templates/pl/jobs-header.tmpl.localize cups-1.4.2/templates/pl/jobs-header.tmpl
+--- cups-1.4.2/templates/pl/jobs-header.tmpl.localize	2009-02-25 17:48:35.000000000 +0100
++++ cups-1.4.2/templates/pl/jobs-header.tmpl	2009-11-20 13:56:58.000000000 +0100
+@@ -2,4 +2,4 @@
+ {?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="completed"><INPUT TYPE="SUBMIT" VALUE="Wyświetl zakończone zadania"></FORM>}
+ {?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Wyświetl wszystkie zadania"></FORM>}</DIV>
+ 
+-<P ALIGN="CENTER">{total=0?Brak zadań:Wyświetlanie {#job_id} z {total} {?which_jobs=?aktywnych:{which_jobs=wszystkich?:zakończonych}} zadań{total=1?:s}}.</P>
++<P ALIGN="CENTER">{total=0?Brak zadań:Wyświetlanie {#job_id} z {total} {?which_jobs=?aktywnych:{which_jobs=all?:zakończonych}} zadań{total=1?:s}}.</P>
+diff -up cups-1.4.2/templates/ru/jobs-header.tmpl.localize cups-1.4.2/templates/ru/jobs-header.tmpl
+--- cups-1.4.2/templates/ru/jobs-header.tmpl.localize	2009-02-17 20:04:25.000000000 +0100
++++ cups-1.4.2/templates/ru/jobs-header.tmpl	2009-11-20 13:53:54.000000000 +0100
+@@ -1,5 +1,6 @@
+ <DIV CLASS="indent">{?which_jobs=?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать активные задания"></FORM>}
+-{?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="Завершено"><INPUT TYPE="SUBMIT" VALUE="Показать завершенные задания"></FORM>}
+-{?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="все"><INPUT TYPE="SUBMIT" VALUE="Показать все задания"></FORM>}</DIV>
++{?which_jobs=completed?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="completed"><INPUT TYPE="SUBMIT" VALUE="Показать завершенные задания"></FORM>}
++{?which_jobs=all?:<FORM ACTION="{?printer_name=?/jobs:{printer_uri_supported}}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="which_jobs" VALUE="all"><INPUT TYPE="SUBMIT" VALUE="Показать все задания"></FORM>}</DIV>
++
++<P ALIGN="CENTER">{total=0?Нет заданий:Задание {#job_id} из {total} {?which_jobs=?активных:{which_jobs=all?:завершенных}}.</P>
+ 
+-<P ALIGN="CENTER">{total=0?Нет заданий:Задание {#job_id} из {total} {?which_jobs=?активных:{which_jobs=всех?:завершенных}}.</P>
diff --git a/cups.spec b/cups.spec
index 33b3266..c2a041c 100644
--- a/cups.spec
+++ b/cups.spec
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -60,6 +60,7 @@ Patch46: cups-str3403.patch
 Patch47: cups-str3407.patch
 Patch48: cups-str3418.patch
 Patch49: cups-CVE-2009-3553.patch
+Patch50: cups-str3422.patch
 
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -224,6 +225,7 @@ module.
 %patch47 -p1 -b .str3407
 %patch48 -p1 -b .str3418
 %patch49 -p1 -b .CVE-2009-3553
+%patch50 -p1 -b .str3422
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -517,6 +519,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Nov 20 2009 Jiri Popelka <jpopelka@redhat.com> 1:1.4.2-8
+- Do not translate russian links showing completed jobs (bug #539354, STR #3422).
+
 * Thu Nov 19 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.2-7
 - Applied patch to fix CVE-2009-3553 (bug #530111, STR #3200).