diff --git a/cups-str3403.patch b/cups-str3403.patch new file mode 100644 index 0000000..d66d163 --- /dev/null +++ b/cups-str3403.patch @@ -0,0 +1,84 @@ +diff -up cups-1.4.2/templates/admin.tmpl.str3403 cups-1.4.2/templates/admin.tmpl +--- cups-1.4.2/templates/admin.tmpl.str3403 2008-09-26 16:52:03.000000000 +0100 ++++ cups-1.4.2/templates/admin.tmpl 2009-11-16 17:21:56.108541688 +0000 +@@ -20,7 +20,7 @@ +

Jobs

+ +

+-

++
+

+ +           +diff -up cups-1.4.2/templates/de/admin.tmpl.str3403 cups-1.4.2/templates/de/admin.tmpl +--- cups-1.4.2/templates/de/admin.tmpl.str3403 2009-04-03 16:55:28.000000000 +0100 ++++ cups-1.4.2/templates/de/admin.tmpl 2009-11-16 17:21:56.109542590 +0000 +@@ -20,7 +20,7 @@ +

Druckaufträge

+ +

+-

++
+

+ +           +diff -up cups-1.4.2/templates/es/admin.tmpl.str3403 cups-1.4.2/templates/es/admin.tmpl +--- cups-1.4.2/templates/es/admin.tmpl.str3403 2009-01-10 00:26:04.000000000 +0000 ++++ cups-1.4.2/templates/es/admin.tmpl 2009-11-16 17:21:56.120542504 +0000 +@@ -20,7 +20,7 @@ +

Trabajos

+ +

+-

++
+

+ +           +diff -up cups-1.4.2/templates/eu/admin.tmpl.str3403 cups-1.4.2/templates/eu/admin.tmpl +--- cups-1.4.2/templates/eu/admin.tmpl.str3403 2009-07-07 17:52:34.000000000 +0100 ++++ cups-1.4.2/templates/eu/admin.tmpl 2009-11-16 17:21:56.120542504 +0000 +@@ -20,7 +20,7 @@ +

Lanak

+ +

+-

++
+

+ +           +diff -up cups-1.4.2/templates/ja/admin.tmpl.str3403 cups-1.4.2/templates/ja/admin.tmpl +--- cups-1.4.2/templates/ja/admin.tmpl.str3403 2009-02-17 19:04:25.000000000 +0000 ++++ cups-1.4.2/templates/ja/admin.tmpl 2009-11-16 17:21:56.120542504 +0000 +@@ -20,7 +20,7 @@ +

ジョブ

+ +

+-

++
+

+ +           +diff -up cups-1.4.2/templates/pl/admin.tmpl.str3403 cups-1.4.2/templates/pl/admin.tmpl +--- cups-1.4.2/templates/pl/admin.tmpl.str3403 2009-02-25 16:48:35.000000000 +0000 ++++ cups-1.4.2/templates/pl/admin.tmpl 2009-11-16 17:21:56.121542314 +0000 +@@ -20,7 +20,7 @@ +

Zadania

+ +

+-

++
+

+ +           +diff -up cups-1.4.2/templates/ru/admin.tmpl.str3403 cups-1.4.2/templates/ru/admin.tmpl +--- cups-1.4.2/templates/ru/admin.tmpl.str3403 2009-10-26 16:01:08.000000000 +0000 ++++ cups-1.4.2/templates/ru/admin.tmpl 2009-11-16 17:21:56.121542314 +0000 +@@ -20,7 +20,7 @@ +

Задания

+ +

+-

++
+

+ +           diff --git a/cups.spec b/cups.spec index e4e2285..9f37f66 100644 --- a/cups.spec +++ b/cups.spec @@ -12,7 +12,7 @@ Version: 1.4.2 Release: 5%{?dist} License: GPLv2 Group: System Environment/Daemons -Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2 +Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source1: cups.init Source2: cupsprinter.png Source3: cups-libusb.rules @@ -56,6 +56,7 @@ Patch42: cups-str3390.patch Patch43: cups-str3391.patch Patch44: cups-str3381.patch Patch45: cups-str3399.patch +Patch46: cups-str3403.patch Patch100: cups-lspp.patch Epoch: 1 @@ -216,6 +217,7 @@ module. %patch43 -p1 -b .str3391 %patch44 -p1 -b .str3381 %patch45 -p1 -b .str3399 +%patch46 -p1 -b .str3403 %if %lspp %patch100 -p1 -b .lspp @@ -510,6 +512,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Nov 16 2009 Tim Waugh 1:1.4.2-5 +- Fixed typo in admin web template (bug #537884, STR #3403). - Reset SIGPIPE handler for child processes (bug #537886, STR #3399). * Mon Nov 16 2009 Tim Waugh 1:1.4.2-4