From 6ca0355187026aabf22f0c5bc213636f3d10997e Mon Sep 17 00:00:00 2001
From: Jiří Popelka <jpopelka@fedoraproject.org>
Date: Apr 16 2010 14:55:32 +0000
Subject: - Fixed str3541.patch

- Added Require: ghostscript (bug #572701)

---

diff --git a/cups-str3541.patch b/cups-str3541.patch
index 49ed2e6..668ce34 100644
--- a/cups-str3541.patch
+++ b/cups-str3541.patch
@@ -1,17 +1,12 @@
-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 -up cups-1.4.3/systemv/lpstat.c.str3541 cups-1.4.3/systemv/lpstat.c
+--- cups-1.4.3/systemv/lpstat.c.str3541	2009-12-15 23:40:37.000000000 +0100
++++ cups-1.4.3/systemv/lpstat.c	2010-04-16 12:56:04.000000000 +0200
+@@ -1423,7 +1423,7 @@ show_jobs(const char *dests,		/* I - Des
+ 
+       rank ++;
+ 
+-      if (match_list(dests, dest) || match_list(users, username))
++      if (match_list(dests, dest) && match_list(users, username))
+       {
+         jobdate = localtime(&jobtime);
+         snprintf(temp, sizeof(temp), "%s-%d", dest, jobid);
diff --git a/cups.spec b/cups.spec
index ff21cb2..bdf8234 100644
--- a/cups.spec
+++ b/cups.spec
@@ -9,7 +9,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
@@ -140,6 +140,9 @@ Requires: portreserve
 
 Requires: poppler-utils
 
+# pstoraster requires gs
+Requires: ghostscript
+
 # We ship udev rules which use setfacl.
 Requires: udev
 Requires: acl
@@ -557,6 +560,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Apr 16 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.2-30
+- Fixed str3541.patch
+- Added Require: ghostscript (bug #572701)
+
 * Wed Mar 31 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.2-29
 - Another BrowsePoll fix: handle EAI_NODATA as well (bug #567353).