From 10beaefb72f31f8d5c1555ed01b9cd36be7dfd80 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Thu, 25 Jun 2015 08:59:36 +0100
Subject: [PATCH] Fix slow resume of jobs after restart (STR #4646).

---
 cups-str4646.patch | 13 +++++++++++++
 cups.spec          |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 cups-str4646.patch

diff --git a/cups-str4646.patch b/cups-str4646.patch
new file mode 100644
index 0000000..14ee21d
--- /dev/null
+++ b/cups-str4646.patch
@@ -0,0 +1,13 @@
+diff -up cups-2.0.3/scheduler/job.c.str4646 cups-2.0.3/scheduler/job.c
+--- cups-2.0.3/scheduler/job.c.str4646	2015-06-25 08:57:18.780913432 +0100
++++ cups-2.0.3/scheduler/job.c	2015-06-25 08:57:29.669132254 +0100
+@@ -392,7 +392,9 @@ cupsdCheckJobs(void)
+ 	  * Start the job...
+ 	  */
+ 
++	  cupsArraySave(ActiveJobs);
+ 	  start_job(job, printer);
++	  cupsArrayRestore(ActiveJobs);
+ 	}
+       }
+     }
diff --git a/cups.spec b/cups.spec
index fac3f42..0fc2a1d 100644
--- a/cups.spec
+++ b/cups.spec
@@ -48,7 +48,7 @@ Patch22: cups-hp-deviceid-oid.patch
 Patch23: cups-dnssd-deviceid.patch
 Patch24: cups-ricoh-deviceid-oid.patch
 Patch25: cups-systemd-socket.patch
-
+Patch26: cups-str4646.patch
 Patch27: cups-avahi-address.patch
 Patch28: cups-enum-all.patch
 Patch29: cups-dymo-deviceid.patch
@@ -234,6 +234,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch24 -p1 -b .ricoh-deviceid-oid
 # Make cups.service Type=notify (bug #1088918).
 %patch25 -p1 -b .systemd-socket
+# Fix slow resume of jobs after restart (STR #4646).
+%patch26 -p1 -b .str4646
 # Use IP address when resolving DNSSD URIs (bug #948288).
 %patch27 -p1 -b .avahi-address
 # Return from cupsEnumDests() once all records have been returned.
@@ -617,6 +619,7 @@ rm -f %{cups_serverbin}/backend/smb
 
 %changelog
 * Thu Jun 25 2015 Tim Waugh <twaugh@redhat.com> - 1:2.0.3-2
+- Fix slow resume of jobs after restart (STR #4646).
 - Fix redirection from CGI scripts (bug #1232030, STR #4538).
 
 * Tue Jun 09 2015 Jiri Popelka <jpopelka@redhat.com> - 1:2.0.3-1