[cups/f14] 1.4.8

[Jiří Popelka]

commit ccb8206c51b3995c8baaf0763929b70585aafb59
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Jul 26 11:06:18 2011 +0200

    1.4.8

 .gitignore             |    1 +
 cups-snmp-quirks.patch |   18 +++++++++---------
 cups-str3875.patch     |   15 ---------------
 cups-str3880.patch     |   46 ----------------------------------------------
 cups.spec              |   17 +++++++----------
 sources                |    2 +-
 6 files changed, 18 insertions(+), 81 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 60f8131..dc5dffb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ cups-1.4.4-source.tar.bz2
 /cups-1.4.5-source.tar.bz2
 /cups-1.4.6-source.tar.bz2
 /cups-1.4.7-source.tar.bz2
+/cups-1.4.8-source.tar.bz2
diff --git a/cups-snmp-quirks.patch b/cups-snmp-quirks.patch
index d7c82a4..51120ad 100644
--- a/cups-snmp-quirks.patch
+++ b/cups-snmp-quirks.patch
@@ -1,6 +1,6 @@
-diff -up cups-1.4.7/backend/snmp-supplies.c.snmp-quirks cups-1.4.7/backend/snmp-supplies.c
---- cups-1.4.7/backend/snmp-supplies.c.snmp-quirks	2011-03-10 04:50:59.000000000 +0100
-+++ cups-1.4.7/backend/snmp-supplies.c	2011-06-28 11:11:57.944155996 +0200
+diff -up cups-1.4.8/backend/snmp-supplies.c.snmp-quirks cups-1.4.8/backend/snmp-supplies.c
+--- cups-1.4.8/backend/snmp-supplies.c.snmp-quirks	2011-07-06 22:27:31.000000000 +0200
++++ cups-1.4.8/backend/snmp-supplies.c	2011-07-26 11:02:14.709121584 +0200
 @@ -49,6 +49,13 @@
  
  
@@ -59,10 +59,10 @@ diff -up cups-1.4.7/backend/snmp-supplies.c.snmp-quirks cups-1.4.7/backend/snmp-
 +      if (quirks & QUIRK_CAPACITY)
 +        supplies[i].max_capacity = 100;
 +
-       percent = 100 * supplies[i].level / supplies[i].max_capacity;
- 
-       if (percent <= 10)
-@@ -406,6 +432,7 @@ backend_init_supplies(
+       if (supplies[i].max_capacity > 0)
+ 	percent = 100 * supplies[i].level / supplies[i].max_capacity;
+       else
+@@ -409,6 +435,7 @@ backend_init_supplies(
      http_addr_t *addr)			/* I - Printer address */
  {
    int		i,			/* Looping var */
@@ -70,7 +70,7 @@ diff -up cups-1.4.7/backend/snmp-supplies.c.snmp-quirks cups-1.4.7/backend/snmp-
  		type;			/* Current marker type */
    cups_file_t	*cachefile;		/* Cache file */
    const char	*cachedir;		/* CUPS_CACHEDIR value */
-@@ -467,6 +494,7 @@ backend_init_supplies(
+@@ -470,6 +497,7 @@ backend_init_supplies(
    current_state = -1;
    num_supplies  = -1;
    charset       = -1;
@@ -78,7 +78,7 @@ diff -up cups-1.4.7/backend/snmp-supplies.c.snmp-quirks cups-1.4.7/backend/snmp-
  
    memset(supplies, 0, sizeof(supplies));
  
-@@ -482,6 +510,34 @@ backend_init_supplies(
+@@ -485,6 +513,34 @@ backend_init_supplies(
      return;
    }
  
diff --git a/cups.spec b/cups.spec
index 1d4fa5c..2912b19 100644
--- a/cups.spec
+++ b/cups.spec
@@ -7,8 +7,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.4.7
-Release: 8%{?dist}
+Version: 1.4.8
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -65,9 +65,7 @@ Patch30: cups-hp-deviceid-oid.patch
 Patch31: cups-dnssd-deviceid.patch
 Patch32: cups-ricoh-deviceid-oid.patch
 Patch33: cups-texttops-rotate-page.patch
-Patch34: cups-str3875.patch
-Patch35: cups-polld-busy-loop.patch
-Patch36: cups-str3880.patch
+Patch34: cups-polld-busy-loop.patch
 
 Patch100: cups-lspp.patch
 
@@ -266,12 +264,8 @@ module.
 # This fixes page-label orientation when texttops is used in the
 # filter chain (bug #572338).
 %patch33 -p1 -b .texttops-rotate-page
-# Fix SNMP supply level crasher (STR #3875, bug #719057).
-%patch34 -p1 -b .str3875
 # Avoid busy loop in cups-polld (bug #720921).
-%patch35 -p1 -b .polld-busy-loop
-# Don't delete job data files when restarted (STR #3880).
-%patch36 -p1 -b .str3880
+%patch34 -p1 -b .polld-busy-loop
 
 %if %lspp
 # LSPP support.
@@ -580,6 +574,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Jul 26 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.8-1
+- 1.4.8
+
 * Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-8
 - Don't delete job data files when restarted (STR #3880).
 
diff --git a/sources b/sources
index 6da4bc9..8c064bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1590033ab4c739b859aeb672fe849089  cups-1.4.7-source.tar.bz2
+0ec52d3f3c69bc2ab5ed70c594edbce6  cups-1.4.8-source.tar.bz2