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

[Jiří Popelka]

commit 70eee1d5377eb17c2255cad31a2fa7b82acdacc1
Merge: e8ee2a1 d55a3eb
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Mar 13 16:23:57 2012 +0100

    Merge branch 'f15' into f16

 .gitignore                           |    1 +
 foomatic-filters-CVE-2011-2924.patch |   32 --------------------------------
 foomatic.spec                        |   18 +++++++-----------
 sources                              |    2 +-
 4 files changed, 9 insertions(+), 44 deletions(-)
---
diff --cc foomatic.spec
index a1136e9,155c9bc..b5ffc67
--- 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:    7%{?dist}
 -Release:    4%{?dist}
++Release:    8%{?dist}
  License:    GPLv2+
  Group: System Environment/Libraries
  
@@@ -184,13 -176,10 +177,16 @@@ exit 
  %{_mandir}/man1/foomatic-rip.1*
  
  %changelog
 -* Tue Mar 13 2012 Jiri Popelka <jpopelka at redhat.com> - 4.0.8-5
++* Tue Mar 13 2012 Jiri Popelka <jpopelka at redhat.com> - 4.0.8-8
+ - Updated filters to 4.0.13
+ 
 -* Mon Oct 24 2011 Jiri Popelka <jpopelka at redhat.com> - 4.0.8-4
 +* Mon Mar  5 2012 Tim Waugh <twaugh at redhat.com> - 4.0.8-7
 +- Rebuilt to pick up new IEEE 1284 Device IDs.
 +
 +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.8-6
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
 +* 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).