rpms/cups
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fixed str3541.patch

Browse Source 
- Added Require: ghostscript (bug #572701)
This commit is contained in:
Jiří Popelka 2010-04-16 11:36:56 +00:00
parent 9347367fba
commit d2516777d5
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cups-str3541.patch
View File

@ -1,17 +1,12 @@
diff -up cups-1.4.2/systemv/lpstat.c.str3541 cups-1.4.2/systemv/lpstat.c diff -up cups-1.4.3/systemv/lpstat.c.str3541 cups-1.4.3/systemv/lpstat.c
--- cups-1.4.2/systemv/lpstat.c.str3541 2009-02-04 23:54:22.000000000 +0100 --- cups-1.4.3/systemv/lpstat.c.str3541 2009-12-15 23:40:37.000000000 +0100
+++ cups-1.4.2/systemv/lpstat.c 2010-03-30 17:38:09.000000000 +0200 +++ cups-1.4.3/systemv/lpstat.c 2010-04-16 12:56:04.000000000 +0200
@@ -581,11 +581,11 @@ match_list(const char *list, /* I - Lis @@ -1423,7 +1423,7 @@ show_jobs(const char *dests, /* I - Des
rank ++;
/* - if (match_list(dests, dest) || match_list(users, username))
- * An empty list always matches... + if (match_list(dests, dest) && match_list(users, username))
+ * An empty list never matches...
*/
if (!list || !*list)
- return (1);
+ return (0);
while (*list)
{ {
jobdate = localtime(&jobtime);
snprintf(temp, sizeof(temp), "%s-%d", dest, jobid);

9
cups.spec
View File

@ -8,7 +8,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.3 Version: 1.4.3
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -117,6 +117,9 @@ Requires: portreserve
Requires: poppler-utils Requires: poppler-utils
# pstoraster requires gs
Requires: ghostscript
# We ship udev rules which use setfacl. # We ship udev rules which use setfacl.
Requires: udev Requires: udev
Requires: acl Requires: acl
@ -523,6 +526,10 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Fri Apr 16 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.3-4
- Fixed str3541.patch
- Added Require: ghostscript (bug #572701)
* Tue Apr 13 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.3-3 * Tue Apr 13 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.3-3
- Handle SNMP supply level quirks (bug #581825). - Handle SNMP supply level quirks (bug #581825).