[gutenprint/f15: 2/2] Merge branch 'f14' into f15

[Tim Waugh]

commit a312bcc7c14ba109a53afbdb1f8eec7ca6731366
Merge: e467a27 0246f23
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Jun 28 17:19:19 2011 +0100

    Merge branch 'f14' into f15

 gutenprint.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc gutenprint.spec
index 7b1a55b,3a88d41..5ef76d5
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@@ -4,7 -4,7 +4,7 @@@
  Name:           gutenprint
  Summary:        Printer Drivers Package
  Version:        5.2.7
--Release:        3%{?dist}
++Release:        4%{?dist}
  Group:          System Environment/Base
  URL:            http://gimp-print.sourceforge.net/
  Source0:	http://dl.sf.net/gimp-print/gutenprint-5.2/%{version}/gutenprint-%{version}.tar.bz2
@@@ -301,10 -301,9 +301,13 @@@ f
  /bin/rm -f /var/cache/foomatic/*
  
  %changelog
 -* Tue Jun 28 2011 Tim Waugh <twaugh at redhat.com> 5.2.7-3
++* Tue Jun 28 2011 Tim Waugh <twaugh at redhat.com> 5.2.7-4
+ - Fixed use of find_lang macro (bug #716426).
+ 
 +* Wed Jun 15 2011 Tim Waugh <twaugh at redhat.com> 5.2.7-3
 +- Rebuilt against new python-cups package to fix postscriptdriver tags
 +  (bug #712074).
 +
  * Tue Jun  7 2011 Tim Waugh <twaugh at redhat.com> 5.2.7-2
  - Fix build against newer versions of gcc.
  - cups-genppdupdate: fixed multicat support (bug #711021).  It was