From 64dde71a307efd82c54752e0990fa61eec2354da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Popelka?= <jpopelka@fedoraproject.org>
Date: Tue, 30 Mar 2010 16:39:21 +0000
Subject: [PATCH] - Fixed lpstat to adhere to -o option (bug #577901, STR
 #3541).

---
 cups-str3541.patch | 17 +++++++++++++++++
 cups.spec          |  7 ++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 cups-str3541.patch

diff --git a/cups-str3541.patch b/cups-str3541.patch
new file mode 100644
index 0000000..49ed2e6
--- /dev/null
+++ b/cups-str3541.patch
@@ -0,0 +1,17 @@
+diff -up cups-1.4.2/systemv/lpstat.c.str3541 cups-1.4.2/systemv/lpstat.c
+--- cups-1.4.2/systemv/lpstat.c.str3541	2009-02-04 23:54:22.000000000 +0100
++++ cups-1.4.2/systemv/lpstat.c	2010-03-30 17:38:09.000000000 +0200
+@@ -581,11 +581,11 @@ match_list(const char *list,		/* I - Lis
+ 
+ 
+  /*
+-  * An empty list always matches...
++  * An empty list never matches...
+   */
+ 
+   if (!list || !*list)
+-    return (1);
++    return (0);
+ 
+   while (*list)
+   {
diff --git a/cups.spec b/cups.spec
index 71ab1cb..fa77965 100644
--- a/cups.spec
+++ b/cups.spec
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 29%{?dist}
+Release: 30%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -78,6 +78,7 @@ Patch51: cups-0755.patch
 Patch52: cups-str3460.patch
 Patch53: cups-EAI_AGAIN.patch
 Patch54: cups-str3505.patch
+Patch55: cups-str3541.patch
 
 Patch100: cups-lspp.patch
 
@@ -263,6 +264,7 @@ module.
 %patch52 -p1 -b .str3460
 %patch53 -p1 -b .EAI_AGAIN
 %patch54 -p1 -b .str3505
+%patch55 -p1 -b .str3541
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -562,6 +564,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Mar 30 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.2-30
+- Fixed lpstat to adhere to -o option (bug #577901, STR #3541).
+
 * Wed Mar 10 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.2-29
 - Fixed (for the third time) patch for STR #3425 to correctly
   remove job info files in /var/spool/cups (bug #571830).