From 3bddcaee69ecae0e103d3bff33fb6ec8839a4717 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Jun 26 2013 16:27:57 +0000
Subject: Don't link against libgcrypt needlessly.


---

diff --git a/cups-no-gcry.patch b/cups-no-gcry.patch
new file mode 100644
index 0000000..69c42dc
--- /dev/null
+++ b/cups-no-gcry.patch
@@ -0,0 +1,37 @@
+diff -up cups-1.6.2/config-scripts/cups-ssl.m4.no-gcry cups-1.6.2/config-scripts/cups-ssl.m4
+--- cups-1.6.2/config-scripts/cups-ssl.m4.no-gcry	2013-06-26 17:26:41.415750243 +0100
++++ cups-1.6.2/config-scripts/cups-ssl.m4	2013-06-26 17:26:41.467750445 +0100
+@@ -93,7 +93,6 @@ if test x$enable_ssl != xno; then
+     dnl Then look for GNU TLS...
+     if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
+     	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
+-    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
+ 	if $PKGCONFIG --exists gnutls; then
+ 	    have_ssl=1
+ 	    SSLLIBS=`$PKGCONFIG --libs gnutls`
+@@ -111,14 +110,6 @@ if test x$enable_ssl != xno; then
+ 	if test $have_ssl = 1; then
+ 	    CUPS_SERVERCERT="ssl/server.crt"
+ 	    CUPS_SERVERKEY="ssl/server.key"
+-
+-            if $PKGCONFIG --exists gcrypt; then
+-	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
+-	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
+-	    elif test "x$LIBGCRYPTCONFIG" != x; then
+-	        SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
+-	        SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
+-	    fi
+ 	fi
+     fi
+ 
+diff -up cups-1.6.2/cups/http-private.h.no-gcry cups-1.6.2/cups/http-private.h
+--- cups-1.6.2/cups/http-private.h.no-gcry	2012-12-17 22:17:08.000000000 +0000
++++ cups-1.6.2/cups/http-private.h	2013-06-26 17:26:41.468750449 +0100
+@@ -78,7 +78,6 @@ typedef int socklen_t;
+ #  elif defined HAVE_GNUTLS
+ #    include <gnutls/gnutls.h>
+ #    include <gnutls/x509.h>
+-#    include <gcrypt.h>
+ #  elif defined(HAVE_CDSASSL)
+ #    include <CoreFoundation/CoreFoundation.h>
+ #    include <Security/Security.h>
diff --git a/cups.spec b/cups.spec
index c40a18b..246e767 100644
--- a/cups.spec
+++ b/cups.spec
@@ -11,7 +11,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 1.6.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cups.org/
@@ -60,6 +60,7 @@ Patch29: cups-enum-all.patch
 Patch30: cups-stringpool-setprinterattr.patch
 Patch31: cups-dymo-deviceid.patch
 Patch32: cups-use-ipp1.1.patch
+Patch33: cups-no-gcry.patch
 
 Patch100: cups-lspp.patch
 
@@ -241,6 +242,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch31 -p1 -b .dymo-deviceid
 # Default to IPP/1.1 for now (bug #977813).
 %patch32 -p1 -b .use-ipp1.1
+# Don't link against libgcrypt needlessly.
+%patch33 -p1 -b .no-gcry
 
 %if %lspp
 # LSPP support.
@@ -642,6 +645,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Wed Jun 26 2013 Tim Waugh <twaugh@redhat.com> 1:1.6.2-13
+- Don't link against libgcrypt needlessly.
+
 * Wed Jun 26 2013 Tim Waugh <twaugh@redhat.com> 1:1.6.2-12
 - Default to IPP/1.1 for now (bug #977813).