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

Merge branch 'f15'

Browse Source
This commit is contained in:
Tim Waugh 2011-07-20 13:26:05 +01:00
commit 8612dba3d9
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cups-str3880.patch Normal file
View File

@ -0,0 +1,34 @@
diff -up cups-1.5rc1/scheduler/job.c.str3880 cups-1.5rc1/scheduler/job.c
--- cups-1.5rc1/scheduler/job.c.str3880 2011-07-20 13:25:04.830715537 +0100
+++ cups-1.5rc1/scheduler/job.c 2011-07-20 13:25:33.637200511 +0100
@@ -1407,17 +1407,22 @@ cupsdDeleteJob(cupsd_job_t *job, /
free(job->compressions);
free(job->filetypes);
- while (job->num_files > 0)
+ if (action == CUPSD_JOB_PURGE)
{
- snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot,
- job->id, job->num_files);
- if (Classification)
- cupsdRemoveFile(filename);
- else
- unlink(filename);
+ while (job->num_files > 0)
+ {
+ snprintf(filename, sizeof(filename), "%s/d%05d-%03d", RequestRoot,
+ job->id, job->num_files);
+ if (Classification)
+ cupsdRemoveFile(filename);
+ else
+ unlink(filename);
- job->num_files --;
+ job->num_files --;
+ }
}
+ else
+ job->num_files = 0;
}
if (job->history)

9
cups.spec
View File

@ -15,7 +15,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.5 Version: 1.5
Release: 0.15.%{alphatag}%{?dist} Release: 0.16.%{alphatag}%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}%{alphatag}/cups-%{version}%{alphatag}-source.tar.bz2 Source: http://ftp.easysw.com/pub/cups/%{version}%{alphatag}/cups-%{version}%{alphatag}-source.tar.bz2
@ -67,6 +67,7 @@ Patch29: cups-ricoh-deviceid-oid.patch
Patch31: cups-avahi.patch Patch31: cups-avahi.patch
Patch32: cups-icc.patch Patch32: cups-icc.patch
Patch33: cups-systemd-socket.patch Patch33: cups-systemd-socket.patch
Patch34: cups-str3880.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -279,6 +280,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
# Poettering). # Poettering).
%patch33 -p1 -b .systemd-socket %patch33 -p1 -b .systemd-socket
# Don't delete job data files when restarted (STR #3880).
%patch34 -p1 -b .str3880
%if %lspp %if %lspp
# LSPP support. # LSPP support.
%patch100 -p1 -b .lspp %patch100 -p1 -b .lspp
@ -625,6 +629,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/ipptool.1.gz %{_mandir}/man1/ipptool.1.gz
%changelog %changelog
* Wed Jul 20 2011 Tim Waugh <twaugh@redhat.com> 1:1.5-0.16.rc1
- Don't delete job data files when restarted (STR #3880).
* Fri Jul 15 2011 Tim Waugh <twaugh@redhat.com> 1:1.5-0.15.rc1 * Fri Jul 15 2011 Tim Waugh <twaugh@redhat.com> 1:1.5-0.15.rc1
- Ship an rpm macro for where to put driver executables. - Ship an rpm macro for where to put driver executables.