[cups: 4/4] Merge branch 'f14'

[Tim Waugh]

commit 852d6ef4ae8a4b92ad3ef0c67def7d400b461528
Merge: 901c315 ac9a4ac
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Jan 18 12:49:05 2011 +0000

    Merge branch 'f14'

 cups.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc cups.spec
index 953154a,3c06741..49485d2
--- a/cups.spec
+++ b/cups.spec
@@@ -8,7 -8,7 +8,7 @@@
  Summary: Common Unix Printing System
  Name: cups
  Version: 1.4.6
- Release: 5%{?dist}
 -Release: 3%{?dist}
++Release: 6%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@@ -603,16 -576,10 +603,20 @@@ rm -rf $RPM_BUILD_ROO
  %{php_extdir}/phpcups.so
  
  %changelog
 -* Tue Jan 18 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-3
++* Tue Jan 18 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-6
+ - Don't use --enable-pie configure option as it has been removed and
+   is now assumed.  See STR #3691.
+ 
 +* Fri Jan 14 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-5
 +- ICC colord support.
 +
 +* Wed Jan 12 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-4
 +- Properly separated serverbin-compat and lspp patches.
 +- Updated ICC patch (still not yet applied).
 +
 +* Tue Jan 11 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-3
 +- Build requires automake for avahi support.
 +
  * Mon Jan 10 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-2
  - Use a smaller buffer when writing to USB devices (bug #617208).
  - Handle EAI_NONAME when resolving hostnames (bug #617208).