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

[Tim Waugh]

commit 011ba18f042839175107efa02d7fa57f890deedb
Merge: efb27f9 8882f95
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Jul 7 14:47:30 2011 +0100

    Merge branch 'f14' into f15

 cups.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc cups.spec
index 20aad6d,065a4f3..8af42bf
--- a/cups.spec
+++ b/cups.spec
@@@ -13,7 -8,7 +13,7 @@@
  Summary: Common Unix Printing System
  Name: cups
  Version: 1.4.7
--Release: 4%{?dist}
++Release: 5%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@@ -624,15 -565,16 +624,19 @@@ rm -rf $RPM_BUILD_ROO
  %{php_extdir}/phpcups.so
  
  %changelog
 -* Thu Jul  7 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-4
++* Thu Jul  7 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-5
+ - Undo last change which had no effect.  We already remove the .SILENT
+   target from the Makefile as part of the build.
+ 
 -* 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.