From 90cf1a0fdd9c82326ba0cd15523365dd5f20c18c Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Jul 26 2011 11:23:01 +0000
Subject: 1.5.0


---

diff --git a/.gitignore b/.gitignore
index 961e480..89a99c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ cups-1.4.4-source.tar.bz2
 /cups-1.5b1-source.tar.bz2
 /cups-1.5b2-source.tar.bz2
 /cups-1.5rc1-source.tar.bz2
+/cups-1.5.0-source.tar.bz2
diff --git a/cups-str3875.patch b/cups-str3875.patch
deleted file mode 100644
index 7d90414..0000000
--- a/cups-str3875.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up cups-1.4.7/backend/snmp-supplies.c.str3875 cups-1.4.7/backend/snmp-supplies.c
---- cups-1.4.7/backend/snmp-supplies.c.str3875	2011-07-07 16:44:41.000000000 +0200
-+++ cups-1.4.7/backend/snmp-supplies.c	2011-07-07 16:48:19.201008765 +0200
-@@ -259,7 +259,10 @@ backendSNMPSupplies(
-       if (quirks & QUIRK_CAPACITY)
-         supplies[i].max_capacity = 100;
- 
--      percent = 100 * supplies[i].level / supplies[i].max_capacity;
-+      if (supplies[i].max_capacity > 0)
-+	percent = 100 * supplies[i].level / supplies[i].max_capacity;
-+      else
-+        percent = 50;
- 
-       if (percent <= 10)
-       {
diff --git a/cups-str3880.patch b/cups-str3880.patch
deleted file mode 100644
index 514fc84..0000000
--- a/cups-str3880.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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)
diff --git a/cups.spec b/cups.spec
index 1d8e1c9..c841a26 100644
--- a/cups.spec
+++ b/cups.spec
@@ -10,15 +10,13 @@
 # but we use lib for compatibility with 3rd party drivers (at upstream request).
 %global cups_serverbin %{_exec_prefix}/lib/cups
 
-%global alphatag rc1
-
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.5
-Release: 0.16.%{alphatag}%{?dist}
+Version: 1.5.0
+Release: 1%{?dist}
 License: GPLv2
 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}/cups-%{version}-source.tar.bz2
 # Pixmap for desktop file
 Source2: cupsprinter.png
 # LSPP-required ps->pdf filter
@@ -67,7 +65,6 @@ Patch29: cups-ricoh-deviceid-oid.patch
 Patch31: cups-avahi.patch
 Patch32: cups-icc.patch
 Patch33: cups-systemd-socket.patch
-Patch34: cups-str3880.patch
 
 Patch100: cups-lspp.patch
 
@@ -213,7 +210,7 @@ module.
 Sends IPP requests to the specified URI and tests and/or displays the results.
 
 %prep
-%setup -q -n %{name}-%{version}%{alphatag}
+%setup -q
 # Don't gzip man pages in the Makefile, let rpmbuild do it.
 %patch1 -p1 -b .no-gzip-man
 # Use the system pam configuration.
@@ -280,9 +277,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 # Poettering).
 %patch33 -p1 -b .systemd-socket
 
-# Don't delete job data files when restarted (STR #3880).
-%patch34 -p1 -b .str3880
-
 %if %lspp
 # LSPP support.
 %patch100 -p1 -b .lspp
@@ -629,6 +623,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ipptool.1.gz
 
 %changelog
+* Tue Jul 26 2011 Jiri Popelka <jpopelka@redhat.com> 1:1.5.0-1
+- 1.5.0
+
 * 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).
 
diff --git a/sources b/sources
index 3ecb48f..e1f3ed2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f2895d2df9e17aa2c5b05838a56e79a8  cups-1.5rc1-source.tar.bz2
+e54ed09ede2340fc3014913333520fe4  cups-1.5.0-source.tar.bz2