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

[Jiří Popelka]

commit 43014f33e76e5cd30c1f9aaa75ece2064ca2343f
Merge: 73f7f6d a398c2c
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Oct 24 13:34:40 2011 +0200

    Merge branch 'f15' into f16

 foomatic-filters-debug-string.patch |   12 ++++++++++++
 foomatic.spec                       |   34 +++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 15 deletions(-)
---
diff --cc foomatic.spec
index 02b1f7c,d8e5cfe..d791d83
--- 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:    4%{?dist}
++Release:    5%{?dist}
  License:    GPLv2+
  Group: System Environment/Libraries
  
@@@ -185,10 -183,15 +184,15 @@@ exit 
  %{_mandir}/man1/foomatic-rip.1*
  
  %changelog
 -* Mon Oct 24 2011 Jiri Popelka <jpopelka at redhat.com> - 4.0.8-4
++* Mon Oct 24 2011 Jiri Popelka <jpopelka at redhat.com> - 4.0.8-5
+ - Use _cups_serverbin macro from cups-devel instead of hard-coded /usr/lib/cups.
+ - No need to define BuildRoot and clean it in clean and install section anymore.
+ - Add argument for format in a debugging string (bug #726384).
+ 
 -* 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).