[cups/f13/master: 5/5] Merge branch 'f12' into f13

[Tim Waugh]

commit bdfb23b51f252e200586464fce308867aae283eb
Merge: c8ee3cf 91b2885
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Sep 17 14:44:14 2010 +0100

    Merge branch 'f12' into f13

 cups-force-gnutls.patch     |   89 +++++++++++++++++++++++++++++++++++
 cups-serialize-gnutls.patch |  109 +++++++++++++++++++++++++++++++++++++++++++
 cups.spec                   |   17 ++++++-
 3 files changed, 213 insertions(+), 2 deletions(-)
---
diff --cc cups.spec
index 7d3cd35,4d4c917..68800fb
--- a/cups.spec
+++ b/cups.spec
@@@ -8,7 -8,7 +8,7 @@@
  Summary: Common Unix Printing System
  Name: cups
  Version: 1.4.4
--Release: 9%{?dist}
++Release: 10%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@@ -571,7 -585,13 +578,13 @@@ rm -rf $RPM_BUILD_ROO
  %{php_extdir}/phpcups.so
  
  %changelog
 -* Fri Sep 17 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-9
++* Fri Sep 17 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-10
+ - Perform locking for gnutls and avoid libgcrypt's broken
+   locking (bug #607159).
 -
 -* Wed Sep 15 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-8
+ - Build with --enable-threads again (bug #607159).
+ - Force the use of gnutls despite thread-safety concerns (bug #607159).
++
 +* Wed Sep 15 2010 Tim Waugh <twaugh at redhat.com>
  - Fixed serverbin-compat patch to avoid misleading "filter not
    available" messages (bug #633779).