From 12ee3e5cb85c88b5c97047d89dbbfdbcd2336401 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Thu, 24 Jun 2010 12:07:08 +0000
Subject: [PATCH] - Use gnutls again but disable threading (bug #607159).

---
 cups.spec | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/cups.spec b/cups.spec
index a2b1b33..990d3d0 100644
--- a/cups.spec
+++ b/cups.spec
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.4
-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
@@ -91,7 +91,7 @@ Provides: cupsddk-drivers = 1.2.3-7
 Conflicts: kdelibs < 6:3.5.2-6
 
 BuildRequires: pam-devel pkgconfig
-BuildRequires: openssl-devel libacl-devel
+BuildRequires: gnutls-devel libacl-devel
 BuildRequires: openldap-devel
 BuildRequires: make >= 1:3.80
 BuildRequires: php-devel, pcre-devel
@@ -137,7 +137,7 @@ Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
 License: LGPLv2
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: openssl-devel
+Requires: gnutls-devel
 Requires: krb5-devel
 Requires: zlib-devel
 Obsoletes: cupsddk-devel < 1.2.3-7
@@ -295,9 +295,10 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1"
 	--enable-lspp \
 %endif
 	--with-log-file-perm=0600 --enable-pie --enable-relro \
-	--enable-pdftops --with-pdftops=pdftops \
+	--with-pdftops=pdftops \
 	--with-dbusdir=%{_sysconfdir}/dbus-1 \
 	--with-php=/usr/bin/php-cgi --enable-avahi \
+	--disable-threads --enable-gnutls \
 	localedir=%{_datadir}/locale
 
 # If we got this far, all prerequisite libraries must be here.
@@ -561,6 +562,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Jun 24 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-4
+- Use gnutls again but disable threading (bug #607159).
+
 * Tue Jun 22 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.4-3
 - Rebuilt to keep correct package n-v-r ordering between releases.