From 9ce00263b6e8ef41f5644dc024c7cc37fcfd8212 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 10 Mar 2009 18:39:13 +0000
Subject: [PATCH] - Applied patch to fix ppd-natural-language attribute in PPD
 list (STR     #3124).

---
 cups-str3124.patch | 25 +++++++++++++++++++++++++
 cups.spec          |  8 +++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 cups-str3124.patch

diff --git a/cups-str3124.patch b/cups-str3124.patch
new file mode 100644
index 0000000..28c1d62
--- /dev/null
+++ b/cups-str3124.patch
@@ -0,0 +1,25 @@
+diff -up cups-1.4b2-svn8404/scheduler/cups-driverd.cxx.str3124 cups-1.4b2-svn8404/scheduler/cups-driverd.cxx
+--- cups-1.4b2-svn8404/scheduler/cups-driverd.cxx.str3124	2009-02-19 17:56:47.000000000 +0000
++++ cups-1.4b2-svn8404/scheduler/cups-driverd.cxx	2009-03-10 17:46:05.000000000 +0000
+@@ -1716,7 +1716,7 @@ load_ppds(const char *d,		/* I - Actual 
+     }
+ 
+     for (i = 0; i < (int)(sizeof(languages) / sizeof(languages[0])); i ++)
+-      if (!strcmp(languages[i].version, lang_version))
++      if (!strcasecmp(languages[i].version, lang_version))
+         break;
+ 
+     if (i < (int)(sizeof(languages) / sizeof(languages[0])))
+@@ -1731,10 +1731,10 @@ load_ppds(const char *d,		/* I - Actual 
+     else
+     {
+      /*
+-      * Unknown language; use "xx"...
++      * Unknown language; use "C"...
+       */
+ 
+-      strcpy(lang_version, "xx");
++      strcpy(lang_version, "C");
+     }
+ 
+    /*
diff --git a/cups.spec b/cups.spec
index 1d44187..74dfda8 100644
--- a/cups.spec
+++ b/cups.spec
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.9%{?dist}
+Release: 0.%{pre}.10%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -38,6 +38,7 @@ Patch11: cups-direct-usb.patch
 Patch12: cups-lpr-help.patch
 Patch13: cups-peercred.patch
 Patch14: cups-pid.patch
+Patch15: cups-str3124.patch
 Patch16: cups-eggcups.patch
 Patch17: cups-getpass.patch
 Patch18: cups-driverd-timeout.patch
@@ -178,6 +179,7 @@ module.
 %patch12 -p1 -b .lpr-help
 %patch13 -p1 -b .peercred
 %patch14 -p1 -b .pid
+%patch15 -p1 -b .str3124
 %patch16 -p1 -b .eggcups
 %patch17 -p1 -b .getpass
 %patch18 -p1 -b .driverd-timeout
@@ -468,6 +470,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Tue Mar 10 2009 Tim Waugh <twaugh@redhat.com> 1:1.4-0.b2.10
+- Applied patch to fix ppd-natural-language attribute in PPD list
+  (STR #3124).
+
 * Mon Mar  9 2009 Tim Waugh <twaugh@redhat.com> 1:1.4-0.b2.9
 - Handle https:// device URIs (bug #478677, STR #3122).