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

[Tim Waugh]

commit efb27f9d3d338a80242640c3d1d1dc81fc03c05a
Merge: 24f7bb4 ed0066f
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Jul 7 09:58:58 2011 +0100

    Merge branch 'f14' into f15

 cups.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc cups.spec
index 8bc3241,0e1d555..20aad6d
--- a/cups.spec
+++ b/cups.spec
@@@ -13,7 -8,7 +13,7 @@@
  Summary: Common Unix Printing System
  Name: cups
  Version: 1.4.7
--Release: 3%{?dist}
++Release: 4%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@@ -624,12 -565,12 +624,15 @@@ rm -rf $RPM_BUILD_ROO
  %{php_extdir}/phpcups.so
  
  %changelog
 -* Thu Jul  7 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-3
++* Thu Jul  7 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-4
+ - Make build log verbose enough to include compiler flags used.
+ 
 -* Wed Jun 29 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-2
 +* Wed Jun 29 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-3
  - Tag localization files correctly (bug #716421).
  
 +* Tue Jun 28 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-2
 +- Updated avahi patches.
 +
  * Tue Jun 28 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.7-1
  - 1.4.7.