[foomatic/f16: 3/3] Merge branch 'f15' into f16

[Tim Waugh]

commit 73f7f6d0efbac5c02fe56f9181b47e092df90288
Merge: 773b88b 08b3258
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Aug 18 16:41:06 2011 +0100

    Merge branch 'f15' into f16

 foomatic-filters-CVE-2011-2924.patch |   22 +++++++++++++++++++++-
 foomatic.spec                        |    5 ++++-
 2 files changed, 25 insertions(+), 2 deletions(-)
---
diff --cc foomatic.spec
index 20fb54f,b264734..02b1f7c
--- a/foomatic.spec
+++ b/foomatic.spec
@@@ -4,7 -4,7 +4,7 @@@
  Summary: Tools for using the foomatic database of printers and printer drivers
  Name:       foomatic
  Version:    %{enginever}
--Release:    3%{?dist}
++Release:    4%{?dist}
  License:    GPLv2+
  Group: System Environment/Libraries
  
@@@ -185,7 -184,10 +185,10 @@@ rm -fr %buildroot $RPM_BUILD_DIR/%{name
  %{_mandir}/man1/foomatic-rip.1*
  
  %changelog
 -* Tue Aug 18 2011 Tim Waugh <twaugh at redhat.com> - 4.0.8-3
++* Tue Aug 18 2011 Tim Waugh <twaugh at redhat.com> - 4.0.8-4
+ - Another fix for CVE-2011-2924 (bug #726426).
+ 
 -* Tue Aug 18 2011 Tim Waugh <twaugh at redhat.com> - 4.0.8-2
 +* Tue Aug 18 2011 Tim Waugh <twaugh at redhat.com> - 4.0.8-3
  - Use mktemp when creating debug log file in foomatic-rip
    (CVE-2011-2924, bug #726426).