diff --git a/cups-str3229.patch b/cups-str3229.patch
index 5a3a080..877fb67 100644
--- a/cups-str3229.patch
+++ b/cups-str3229.patch
@@ -1,6 +1,6 @@
diff -up cups-1.4rc1/templates/add-printer.tmpl.str3229 cups-1.4rc1/templates/add-printer.tmpl
--- cups-1.4rc1/templates/add-printer.tmpl.str3229 2008-09-20 04:33:59.000000000 +0100
-+++ cups-1.4rc1/templates/add-printer.tmpl 2009-06-17 15:58:21.927317253 +0100
++++ cups-1.4rc1/templates/add-printer.tmpl 2009-06-18 18:58:12.242510800 +0100
@@ -29,7 +29,7 @@
@@ -10,9 +10,81 @@ diff -up cups-1.4rc1/templates/add-printer.tmpl.str3229 cups-1.4rc1/templates/ad
Share This Printer
+diff -up cups-1.4rc1/templates/de/add-printer.tmpl.str3229 cups-1.4rc1/templates/de/add-printer.tmpl
+--- cups-1.4rc1/templates/de/add-printer.tmpl.str3229 2009-04-03 16:55:28.000000000 +0100
++++ cups-1.4rc1/templates/de/add-printer.tmpl 2009-06-18 18:58:12.255510590 +0100
+@@ -29,7 +29,7 @@
+
+
+ | Freigabe: |
+-
++ |
+ Diesen Drucker freigeben |
+
+
+diff -up cups-1.4rc1/templates/de/modify-printer.tmpl.str3229 cups-1.4rc1/templates/de/modify-printer.tmpl
+--- cups-1.4rc1/templates/de/modify-printer.tmpl.str3229 2009-04-03 16:55:28.000000000 +0100
++++ cups-1.4rc1/templates/de/modify-printer.tmpl 2009-06-18 18:58:12.258635708 +0100
+@@ -23,7 +23,7 @@
+
+
+ | Freigabe: |
+-
++ |
+ Diesen Drucker freigeben |
+
+
+diff -up cups-1.4rc1/templates/es/add-printer.tmpl.str3229 cups-1.4rc1/templates/es/add-printer.tmpl
+--- cups-1.4rc1/templates/es/add-printer.tmpl.str3229 2008-12-08 21:20:06.000000000 +0000
++++ cups-1.4rc1/templates/es/add-printer.tmpl 2009-06-18 18:58:12.267511070 +0100
+@@ -29,7 +29,7 @@
+
+
+ | Compartición: |
+-
++ |
+ Compartir esta impresora |
+
+
+diff -up cups-1.4rc1/templates/es/modify-printer.tmpl.str3229 cups-1.4rc1/templates/es/modify-printer.tmpl
+--- cups-1.4rc1/templates/es/modify-printer.tmpl.str3229 2008-12-08 21:20:06.000000000 +0000
++++ cups-1.4rc1/templates/es/modify-printer.tmpl 2009-06-18 18:58:12.270511552 +0100
+@@ -23,7 +23,7 @@
+
+
+ | Compartida: |
+-
++ |
+ Compartir esta impresora |
+
+
+diff -up cups-1.4rc1/templates/ja/add-printer.tmpl.str3229 cups-1.4rc1/templates/ja/add-printer.tmpl
+--- cups-1.4rc1/templates/ja/add-printer.tmpl.str3229 2009-02-17 19:04:25.000000000 +0000
++++ cups-1.4rc1/templates/ja/add-printer.tmpl 2009-06-18 18:58:12.242510800 +0100
+@@ -29,7 +29,7 @@
+
+
+ | 共有: |
+-
++ |
+ このプリンターを共有する |
+
+
+diff -up cups-1.4rc1/templates/ja/modify-printer.tmpl.str3229 cups-1.4rc1/templates/ja/modify-printer.tmpl
+--- cups-1.4rc1/templates/ja/modify-printer.tmpl.str3229 2009-02-17 19:04:25.000000000 +0000
++++ cups-1.4rc1/templates/ja/modify-printer.tmpl 2009-06-18 18:58:12.243635944 +0100
+@@ -23,7 +23,7 @@
+
+
+ | 共有: |
+-
++ |
+ このプリンターを共有する |
+
+
diff -up cups-1.4rc1/templates/modify-printer.tmpl.str3229 cups-1.4rc1/templates/modify-printer.tmpl
--- cups-1.4rc1/templates/modify-printer.tmpl.str3229 2008-09-20 04:33:59.000000000 +0100
-+++ cups-1.4rc1/templates/modify-printer.tmpl 2009-06-17 15:58:21.928317580 +0100
++++ cups-1.4rc1/templates/modify-printer.tmpl 2009-06-18 18:58:12.246635665 +0100
@@ -23,7 +23,7 @@
@@ -22,3 +94,51 @@ diff -up cups-1.4rc1/templates/modify-printer.tmpl.str3229 cups-1.4rc1/templates
Share This Printer
+diff -up cups-1.4rc1/templates/pl/add-printer.tmpl.str3229 cups-1.4rc1/templates/pl/add-printer.tmpl
+--- cups-1.4rc1/templates/pl/add-printer.tmpl.str3229 2009-02-25 16:48:35.000000000 +0000
++++ cups-1.4rc1/templates/pl/add-printer.tmpl 2009-06-18 18:58:12.261635679 +0100
+@@ -29,7 +29,7 @@
+
+
+ | Współdzielenie: |
+-
++ |
+ Współdzielenie tej drukarki |
+
+
+diff -up cups-1.4rc1/templates/pl/modify-printer.tmpl.str3229 cups-1.4rc1/templates/pl/modify-printer.tmpl
+--- cups-1.4rc1/templates/pl/modify-printer.tmpl.str3229 2009-02-25 16:48:35.000000000 +0000
++++ cups-1.4rc1/templates/pl/modify-printer.tmpl 2009-06-18 18:58:12.264511505 +0100
+@@ -23,7 +23,7 @@
+
+
+ | Współdzielenie: |
+-
++ |
+ Share This Printer |
+
+
+diff -up cups-1.4rc1/templates/ru/add-printer.tmpl.str3229 cups-1.4rc1/templates/ru/add-printer.tmpl
+--- cups-1.4rc1/templates/ru/add-printer.tmpl.str3229 2009-02-17 19:04:25.000000000 +0000
++++ cups-1.4rc1/templates/ru/add-printer.tmpl 2009-06-18 18:58:12.249511736 +0100
+@@ -29,7 +29,7 @@
+
+
+ | Совместный доступ: |
+-
++ |
+ Разрешить совместный доступ к этому принтеру |
+
+
+diff -up cups-1.4rc1/templates/ru/modify-printer.tmpl.str3229 cups-1.4rc1/templates/ru/modify-printer.tmpl
+--- cups-1.4rc1/templates/ru/modify-printer.tmpl.str3229 2009-02-17 19:04:25.000000000 +0000
++++ cups-1.4rc1/templates/ru/modify-printer.tmpl 2009-06-18 18:58:12.252511667 +0100
+@@ -23,7 +23,7 @@
+
+
+ | Совместный доступ: |
+-
++ |
+ Разрешить совместный доступ к этому принтеру |
+
+
diff --git a/cups.spec b/cups.spec
index 7862fab..8dc72a7 100644
--- a/cups.spec
+++ b/cups.spec
@@ -7,7 +7,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4
-Release: 0.%{pre}.3%{?dist}
+Release: 0.%{pre}.4%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -470,6 +470,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/php/modules/*.so
%changelog
+* Thu Jun 18 2009 Tim Waugh 1:1.4-0.rc1.4
+- More complete fix for STR #3229 (bug #506461).
+
* Wed Jun 17 2009 Tim Waugh 1:1.4-0.rc1.3
- Don't use RPM_SOURCE_DIR macro.
- Fixed add/modify-printer templates which had extra double-quote