From 3b2095db5b58e257d9f4f9a9c2b152bc4b867476 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Nov 07 2014 08:52:09 +0000
Subject: Enable SSL again via GnuTLS (bug #1161235).


---

diff --git a/cups.spec b/cups.spec
index c9d8491..479150b 100644
--- a/cups.spec
+++ b/cups.spec
@@ -11,7 +11,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 2.0.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Url: http://www.cups.org/
 Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@@ -33,6 +33,7 @@ Patch3: cups-multilib.patch
 
 Patch5: cups-banners.patch
 Patch6: cups-serverbin-compat.patch
+Patch7: cups-no-export-ssllibs.patch
 Patch8: cups-direct-usb.patch
 Patch9: cups-lpr-help.patch
 Patch10: cups-peercred.patch
@@ -76,6 +77,7 @@ Requires: %{name}-client%{?_isa} = %{epoch}:%{version}-%{release}
 Provides: cupsddk cupsddk-drivers
 
 BuildRequires: pam-devel pkgconfig
+BuildRequires: gnutls-devel
 BuildRequires: libacl-devel
 BuildRequires: openldap-devel
 BuildRequires: pkgconfig(libusb-1.0)
@@ -125,6 +127,7 @@ Provides: lpr
 Summary: CUPS printing system - development environment
 License: LGPLv2
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: gnutls-devel
 Requires: krb5-devel
 Requires: zlib-devel
 Provides: cupsddk-devel
@@ -198,6 +201,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch5 -p1 -b .banners
 # Use compatibility fallback path for ServerBin.
 %patch6 -p1 -b .serverbin-compat
+# Don't export SSLLIBS to cups-config.
+%patch7 -p1 -b .no-export-ssllibs
 # Allow file-based usb device URIs.
 %patch8 -p1 -b .direct-usb
 # Add --help option to lpr.
@@ -301,6 +306,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1"
 	--with-php=/usr/bin/php-cgi \
 	--enable-avahi \
 	--enable-threads \
+	--enable-gnutls \
 	--enable-webif \
 	--with-xinetd=no \
 	localedir=%{_datadir}/locale
@@ -610,6 +616,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Fri Nov  7 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-12
+- Enable SSL again via GnuTLS (bug #1161235).
+
 * Thu Nov  6 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-11
 - Removed openssl requirements from spec file as it is no longer
   supported upstream (see bug #1161235).